Merge branch 'acpi-scan' into acpi-video
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 16 Jun 2015 17:59:09 +0000 (19:59 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 16 Jun 2015 17:59:09 +0000 (19:59 +0200)

Trivial merge