[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
authorLen Brown <len.brown@intel.com>
Fri, 5 Aug 2005 04:31:42 +0000 (00:31 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 5 Aug 2005 04:31:42 +0000 (00:31 -0400)
Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge