Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Sun, 18 Jan 2015 13:12:48 +0000 (13:12 +0000)
committerMark Brown <broonie@kernel.org>
Sun, 18 Jan 2015 13:12:48 +0000 (13:12 +0000)
commitcc43a17507644ad34d07a3e95d7376d55fd82b15
treeaa6c48a80f001853e780d0738b5a8d843250ff46
parent71220c39c683cc0eb4d5300268cd061dd249933e
parent4bb26215c07fb204ae1d66e54406dd6bae793c20
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk

Conflicts:
arch/arm64/kernel/Makefile
drivers/cpuidle/Makefile
arch/arm/kernel/Makefile
arch/arm64/include/asm/cpu_ops.h
arch/arm64/kernel/Makefile
drivers/cpuidle/Makefile