]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commitd120cfb544ed6161b9d32fb6c4648c471807ee6b
tree7757ad0198d8df76ff5c60f939a687687c41da00
parent9dce0e950dbfab4148f35ac6f297d8638cdc63c4
parentbf7e8511088963078484132636839b59e25cf14f
merge linus into release branch

Conflicts:

drivers/acpi/acpi_memhotplug.c
drivers/acpi/Kconfig
drivers/acpi/acpi_memhotplug.c