tree 751337a429d58b60e03e22d2a30fccd87e1bc02a
parent d2716578e439a5a693d0817e8ab89802b33b4ded
parent 7919010c4224e07b871f3b5513d245cc029fcd67
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1395104008 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1395104008 +0100

Merge branch 'acpi-config' into acpica

Conflicts:
	include/acpi/platform/aclinux.h