diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-07-03 18:37:33 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-07-03 18:37:33 +0400 |
| commit | 4a7b6bab1bd040e5f3c6fbd7cea3e848abdb3928 (patch) | |
| tree | 35134a41cef7fcce4af5650b175c4e4e92e82591 /include/linux/pfkeyv2.h | |
| parent | 3bb38769bdf6a3da500908de4f7ae4458be4a7a7 (diff) | |
| parent | aa887ff761b432d16559dac6205cc7f3d0c35d1e (diff) | |
Automatically merging tracking-ubuntu-sauce into merge-linux-linaro-core-tracking
Conflicting files:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-highbank/smc.S
arch/x86/kernel/reboot.c
drivers/base/power/main.c
drivers/mmc/host/omap_hsmmc.c
include/asm-generic/bug.h
Diffstat (limited to 'include/linux/pfkeyv2.h')
0 files changed, 0 insertions, 0 deletions