merge linus into release branch
authorLen Brown <len.brown@intel.com>
Thu, 29 Jun 2006 23:57:46 +0000 (19:57 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 29 Jun 2006 23:57:46 +0000 (19:57 -0400)
Conflicts:

drivers/acpi/acpi_memhotplug.c


Trivial merge