diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-19 19:09:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-19 19:09:14 +0000 |
| commit | acdf91f9c4d791cec5ca7b4ecae9522bd7054b05 (patch) | |
| tree | 1b793271aa3cf3c24a189c1dc25eea29757cabbf /drivers/firmware/efi/vars.c | |
| parent | 326dc1f1f301eaaf91619c359b85cd98c2ff4374 (diff) | |
| parent | 890ca6222dbe3c4c0719748aa9030e0ce1aa5c11 (diff) | |
Merge remote-tracking branch 'lsk/v3.14/topic/aosp' into linux-linaro-lsk-v3.14-android
Conflicts:
arch/arm64/Kconfig
arch/arm64/crypto/Makefile
arch/arm64/crypto/aes-glue.c
arch/arm64/include/asm/ptrace.h
arch/arm64/include/asm/thread_info.h
arch/arm64/include/asm/unistd32.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/entry.S
arch/arm64/kernel/ptrace.c
drivers/base/cpu.c
drivers/of/fdt.c
fs/pstore/inode.c
kernel/futex.c
Diffstat (limited to 'drivers/firmware/efi/vars.c')
0 files changed, 0 insertions, 0 deletions