Merge branch 'acpica' into release
authorLen Brown <len.brown@intel.com>
Mon, 25 Oct 2010 06:10:36 +0000 (02:10 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 25 Oct 2010 06:10:36 +0000 (02:10 -0400)
commitaca209e5e654951a3a90f5aaa8e04e0c470993b4
tree5de472175d8edcbdf7a98022af7bf650bde761e9
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f
parent8df3fc981dc12d9fdcaef4100a2193b605024d7a
Merge branch 'acpica' into release

Conflicts:
drivers/acpi/acpica/aclocal.h

Signed-off-by: Len Brown <len.brown@intel.com>
include/acpi/acpixf.h