Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --cc drivers/base/power/main.c
index 2c41a74d0eda09e2b087db0ecbd0b49b68128fa2,5a9b6569dd74f8cc97ba15fde613f208bd752c46..5131ad8ca17f7550d53666bb7d3b86ffd2a063db
--- 1/drivers/base/power/main.c
--- 2/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@ -28,12 -28,7 +28,10 @@@
  #include <linux/sched.h>
  #include <linux/async.h>
  #include <linux/suspend.h>
- #include <trace/events/power.h>
- #include <linux/cpufreq.h>
  #include <linux/cpuidle.h>
 +#include <linux/timer.h>
 +#include <linux/wakeup_reason.h>
 +
  #include "../base.h"
  #include "power.h"
  

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc include/linux/cpufreq.h
Simple merge