Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Tue, 29 Jul 2014 05:34:19 +0000 (13:34 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 29 Jul 2014 05:34:19 +0000 (13:34 +0800)
commit77917ecac9c37f9f02e7954b617df8f824894778
treef66f255d84847a55722f4a608dc429baf3c5e43b
parent4a9948e4921af4c4b6a9f1120b9a05122957d09d
parent92488f4c9f687cc0e274be561f7b168743f59f20
Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/x86/Kconfig
drivers/irqchip/irq-gic.c
kernel/sched/debug.c