From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 15 Jun 2015 12:38:55 +0000 (+0200)
Subject: Merge branch 'acpi-scan' into acpi-cca
X-Git-Tag: firefly_0821_release~176^2~1607^2~9^2~7
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=faacd5ad83857300df4b7b1814ef2eb963063c14;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-scan' into acpi-cca
---

faacd5ad83857300df4b7b1814ef2eb963063c14