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)
commit3fc7aeeb08bfde59877e7f9a4eea3c5ebcae72be
treea330cc99dfe18859b55ec40cb68afcf3369a97fc
parentd770e558e21961ad6cfdf0ff7df0eb5d7d4f0754
parent6d3dab7d84177f836b14961b4d252d0959d66768
Merge branch 'pm-wakeirq'

* pm-wakeirq:
  PM / wakeirq: Avoid setting power.wakeirq too hastily
drivers/base/power/wakeup.c