| commit | 2120557722577d8cff75a33a799ad15582dbd8ef | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Tue Jul 11 14:21:20 2017 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Tue Jul 11 16:22:22 2017 +0800 |
| tree | 2518d0dd3038f52cc9d4a26200594132e115f829 | |
| parent | afd012a6a05f426411186b5ed23c99bb0d83cbe7 [diff] | |
| parent | 03a929fbcbb1f7dca3cca19eefcbc15ecc191331 [diff] |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android Conflicts: arch/arm64/kernel/armv8_deprecated.c arch/arm64/kernel/efi.c arch/arm64/kernel/entry.S arch/arm64/kernel/head.S arch/arm64/kernel/hw_breakpoint.c arch/arm64/mm/mmu.c include/linux/memblock.h mm/memblock.c