Merge 3.3-rc2 into the driver-core-next branch.

This was done to resolve a merge and build problem with the
drivers/acpi/processor_driver.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index da57fdcc57d2..9d650476d5dc 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -195,6 +195,7 @@ struct acpi_processor_flags {
         u8 has_cst:1;
         u8 power_setup_done:1;
         u8 bm_rld_set:1;
+        u8 need_hotplug_init:1;
 };
 
 struct acpi_processor {