From: Mark Brown <broonie@linaro.org>
Date: Wed, 23 Apr 2014 22:55:40 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~139
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8acfe32cb8716b76814e9a7c964354b91e5ce886;p=firefly-linux-kernel-4.4.55.git

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

8acfe32cb8716b76814e9a7c964354b91e5ce886
diff --cc drivers/base/power/main.c
index 6a33dd85c044,220ec3a3ca75..a42c3548bdd3
--- a/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"