Merge branch 'acpi-lpss' into pm-runtime
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 3 Dec 2014 23:50:06 +0000 (00:50 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 3 Dec 2014 23:50:06 +0000 (00:50 +0100)

Trivial merge