Merge acpi-2.6.12 to-akpm
authorLen Brown <len.brown@intel.com>
Thu, 11 Aug 2005 21:43:19 +0000 (17:43 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 11 Aug 2005 21:43:19 +0000 (17:43 -0400)

Trivial merge