From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 16 Jun 2015 17:59:09 +0000 (+0200)
Subject: Merge branch 'acpi-scan' into acpi-video
X-Git-Tag: v4.2-rc1~57^2^2~36
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e08f84e87789f0b1823e4f8c5ba38154db783eec;p=linux-block.git

Merge branch 'acpi-scan' into acpi-video
---

e08f84e87789f0b1823e4f8c5ba38154db783eec