From: Mark Brown <broonie@kernel.org>
Date: Mon, 9 Mar 2015 12:27:34 +0000 (+0000)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~22
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e8f1cafd746408478934b9c8b9e9e0d5f450906c;p=firefly-linux-kernel-4.4.55.git

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

e8f1cafd746408478934b9c8b9e9e0d5f450906c
diff --cc drivers/base/power/main.c
index 2c41a74d0eda,5a9b6569dd74..5131ad8ca17f
--- a/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"