From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 1 Dec 2014 22:51:00 +0000 (+0100)
Subject: Merge branch 'acpica' into acpi-pm
X-Git-Tag: v3.19-rc1~129^2~6^3~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=331dfcf830a424dacbe11f0543ebf6097ae89964;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'acpica' into acpi-pm
---

331dfcf830a424dacbe11f0543ebf6097ae89964