Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel...
authorMark Brown <broonie@linaro.org>
Fri, 19 Jul 2013 09:42:11 +0000 (10:42 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 19 Jul 2013 09:42:11 +0000 (10:42 +0100)
commit0b37fbf7508ff30e1d3668fea74e82f842448354
tree6d01fee5e95e1d4a8042ef473d61dd816b43d13e
parent0a37d59e3c8c2299f8931df0cb1c0f525047fab5
parenta88f9e27498afaea615ad3e93af4f26df1f84987
Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android

Conflicts:
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
kernel/futex.c
15 files changed:
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/common/Makefile
arch/arm/include/asm/hardirq.h
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
arch/arm/mm/fault.c
block/genhd.c
drivers/cpufreq/Makefile
drivers/cpufreq/cpufreq_stats.c
drivers/video/Kconfig
include/linux/sched.h
kernel/futex.c
kernel/power/Kconfig
kernel/sched/core.c