merge 2.6.13-rc4 with ACPI's to-linus tree
authorLen Brown <len.brown@intel.com>
Sat, 30 Jul 2005 05:55:32 +0000 (01:55 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 30 Jul 2005 05:55:32 +0000 (01:55 -0400)

Trivial merge