Merge branch 'acpi-scan' into acpi-cca
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 15 Jun 2015 12:38:55 +0000 (14:38 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 15 Jun 2015 12:38:55 +0000 (14:38 +0200)

Trivial merge