Merge branches 'pm-wakeup' and 'pm-domains'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:29:49 +0000 (13:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:29:49 +0000 (13:29 +0200)
commit62d6f06cd5c8dd2cfcc351f6e3b41d71d43c4ee3
tree879729729b35286003c07617e2f710516a8027f9
parent0f9481ac2103861d3ca27f0e44a9335d9eb45f1e
parentd0549801659747c46092fb22db1488100d7923e4
parent39ac5ba51b69a77a30d2e783aed02ec73c9f6d70
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