Merge branch 'pm-genirq' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Sep 2014 18:46:13 +0000 (20:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Sep 2014 18:46:13 +0000 (20:46 +0200)

Trivial merge