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)
commitfaacd5ad83857300df4b7b1814ef2eb963063c14
tree57f775901276792de38bea290da3822eba7e1df4
parent0f57d86787d8b1076ea8f9cbdddda2a46d534a27
parent0519ade71852701ec76ee7f8a0b37fe5a5504f98
Merge branch 'acpi-scan' into acpi-cca