Merge branch 'acpi-config' into acpica
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 18 Mar 2014 00:53:28 +0000 (01:53 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 18 Mar 2014 00:53:28 +0000 (01:53 +0100)
Conflicts:
include/acpi/platform/aclinux.h


Trivial merge