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

diff --cc drivers/base/power/main.c
index 6a33dd85c044f250c012b57d9afec915f12fe647,220ec3a3ca750907bb26c3f2866e1c012b04db52..a42c3548bdd34bcfe4d3e47390c438333c7d35cc
--- 1/drivers/base/power/main.c
--- 2/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@ -28,9 -28,9 +28,11 @@@
  #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 "../base.h"
  #include "power.h"
  

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

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