Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 19:26:53 +0000 (20:26 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 19:29:53 +0000 (20:29 +0100)
commit0a2d5c259e6f205298964b3bab8c93098fccc86a
treeb12be5fa9949a84f525799944f3797ce63619aa0
parent05299d3dafd25738682a0f93bb8764563413b385
parentc1a0dd11e183ccd2dbc42ab699a65a335e065936
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts (the ARM security fixes vs the read only kernel changes from
Google):
arch/arm/mm/mmu.c
arch/arm/Kconfig
arch/arm/kernel/process.c
arch/arm/mm/mmu.c
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_governor.c
drivers/cpufreq/cpufreq_governor.h
drivers/cpuidle/governors/menu.c
drivers/mtd/nand/Kconfig
kernel/cgroup.c
kernel/trace/trace.c