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>
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user