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)
commitbcef50814c9de8e0672d3e7f9f1abd85e1b95d13
tree751337a429d58b60e03e22d2a30fccd87e1bc02a
parentd2716578e439a5a693d0817e8ab89802b33b4ded
parent7919010c4224e07b871f3b5513d245cc029fcd67
Merge branch 'acpi-config' into acpica

Conflicts:
include/acpi/platform/aclinux.h
include/acpi/platform/aclinux.h