tree 7757ad0198d8df76ff5c60f939a687687c41da00
parent 9dce0e950dbfab4148f35ac6f297d8638cdc63c4
parent bf7e8511088963078484132636839b59e25cf14f
author Len Brown <len.brown@intel.com> 1151625466 -0400
committer Len Brown <len.brown@intel.com> 1151625466 -0400

merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c