Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Fri, 10 Jan 2014 02:50:57 +0000 (10:50 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 10 Jan 2014 02:50:57 +0000 (10:50 +0800)
commit450cdfa9c5713551ab1438ab210679868b52a994
treeedd98f9698aa88af55a3a1ee3de62e52917c39ba
parentbf78886fb6c4131885f84f3eaaf7474509d40e51
parent8b4ed85b8404ffe7e10ee410c4df3968b86f0793
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk

Conflicts:
arch/arm64/kernel/smp.c

Signed-off-by: Alex Shi <alex.shi@linaro.org>
Documentation/kernel-parameters.txt
arch/arm/include/asm/arch_timer.h
arch/arm64/kernel/smp.c
kernel/sched/core.c
kernel/sched/fair.c