Merge branch 'acpica' into release
Len Brown [Mon, 25 Oct 2010 06:10:36 +0000 (02:10 -0400)]
Conflicts:
drivers/acpi/acpica/aclocal.h

Signed-off-by: Len Brown <len.brown@intel.com>

1  2 
include/acpi/acpixf.h

Simple merge