From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 9 Mar 2012 20:35:53 +0000 (-0800)
Subject: Merge 3.3-rc6 into driver-core-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=263a5c8e16c34199ddf6de3f102e789ffa3ee26e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge 3.3-rc6 into driver-core-next

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

263a5c8e16c34199ddf6de3f102e789ffa3ee26e
diff --cc drivers/base/cpu.c
index 2a0c670c281d,4dabf5077c48..adf937bf4091
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@@ -222,11 -240,10 +241,13 @@@ int __cpuinit register_cpu(struct cpu *
  	int error;
  
  	cpu->node_id = cpu_to_node(num);
+ 	memset(&cpu->dev, 0x00, sizeof(struct device));
  	cpu->dev.id = num;
  	cpu->dev.bus = &cpu_subsys;
+ 	cpu->dev.release = cpu_device_release;
 +#ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
 +	cpu->dev.bus->uevent = arch_cpu_uevent;
 +#endif
  	error = device_register(&cpu->dev);
  	if (!error && cpu->hotpluggable)
  		register_cpu_control(cpu);