Merge linux-2.6 with linux-acpi-2.6
authorLen Brown <len.brown@intel.com>
Thu, 8 Sep 2005 05:45:47 +0000 (01:45 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 8 Sep 2005 05:45:47 +0000 (01:45 -0400)

Trivial merge