Merge branch 'acpi-driver-core' into device-properties
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 25 Mar 2015 19:59:51 +0000 (20:59 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 25 Mar 2015 19:59:51 +0000 (20:59 +0100)

Trivial merge