From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 8 Apr 2014 11:29:49 +0000 (+0200)
Subject: Merge branches 'pm-wakeup' and 'pm-domains'
X-Git-Tag: firefly_0821_release~176^2~4082^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=62d6f06cd5c8dd2cfcc351f6e3b41d71d43c4ee3;p=firefly-linux-kernel-4.4.55.git

Merge branches 'pm-wakeup' and 'pm-domains'

* pm-wakeup:
  PM / wakeup: Correct presence vs. emptiness of wakeup_* attributes

* pm-domains:
  PM / domains: Add pd_ignore_unused to keep power domains enabled
---

62d6f06cd5c8dd2cfcc351f6e3b41d71d43c4ee3