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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2012-02-02 11:24:44 -08:00
commit bd1d462e13
586 changed files with 5488 additions and 8308 deletions

View file

@ -543,7 +543,7 @@ int intel_idle_cpu_init(int cpu)
return 0;
}
EXPORT_SYMBOL_GPL(intel_idle_cpu_init);
static int __init intel_idle_init(void)
{