Merge branch 'bjorn-start-stop-2.6.32' into release

diff --cc drivers/acpi/acpi_memhotplug.c
Simple merge

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/acpi/processor_core.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge