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

diff --cc drivers/base/power/main.c
Simple merge

diff --cc drivers/base/power/wakeup.c
Simple merge

diff --cc include/linux/pm.h
Simple merge