Merge branch 'pm-wakeirq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 7 Jul 2015 20:47:43 +0000 (22:47 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 7 Jul 2015 20:47:43 +0000 (22:47 +0200)
* pm-wakeirq:
  PM / wakeirq: Avoid setting power.wakeirq too hastily

1  2 
drivers/base/power/wakeup.c

Simple merge