Merge linux-2.6 into linux-acpi-2.6 test
authorLen Brown <len.brown@intel.com>
Sat, 3 Sep 2005 06:44:09 +0000 (02:44 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 3 Sep 2005 06:44:09 +0000 (02:44 -0400)

Trivial merge