Merge branch 'pm-wakeirq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:18:14 +0000 (01:18 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:18:14 +0000 (01:18 +0200)
commit0d85fd42114ce97f209f3deb91ea0ac992c56013
treef177a06c6cff29818e93d9bd9bc1ad85781be34e
parentab232ba57043ca85b55ffd7125f3f2c2d7e732ec
parentdb874c7e10557f8f1af9a6fb1ec6589ae06f349c
Merge branch 'pm-wakeirq'

* pm-wakeirq:
  PM / wakeirq: Fix typo in prototype for dev_pm_set_dedicated_wake_irq
  PM / Wakeirq: Add automated device wake IRQ handling
drivers/base/power/main.c
drivers/base/power/wakeup.c
include/linux/pm.h