| commit | a5d53ad243dc3178fa9001d8ab1f19c63f8debd5 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu May 15 20:29:29 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu May 15 20:29:29 2014 +0100 |
| tree | 0139239f56b2dea497a003b4512a4ba849591306 | |
| parent | 15fdd2469e03d44975d548a73e689a725e76a5ee [diff] | |
| parent | 8751cf9a6c5f5bf02a2de8a4c025e09b38556df4 [diff] |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk Conflicts: Documentation/arm64/tagged-pointers.txt arch/arm64/Kconfig arch/arm64/boot/dts/Makefile arch/arm64/include/asm/arch_timer.h arch/arm64/include/asm/elf.h arch/arm64/include/asm/spinlock.h arch/arm64/kernel/smp.c