Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 25 Jul 2013 23:01:00 +0000 (00:01 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 25 Jul 2013 23:01:00 +0000 (00:01 +0100)
commit535ad2c06cf12f3f075e3d9a141476beb367ae6b
tree7ab4365d17bf07bd636177fb1c485a1ba899c5ea
parent9f6772da061814c2962aeb7d79231f7510dba313
parent04e780d9cc5d55b07286a5ecbc455c027a81ab7f
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_governor.c
drivers/cpufreq/cpufreq_stats.c
kernel/printk.c
kernel/trace/trace.c
kernel/trace/trace.h