From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 16 Mar 2012 19:15:48 +0000 (+0000)
Subject: Merge branch 'depends/driver-core' into ux500/dt
X-Git-Tag: MMI-PSA29.97-13-9~17153^2~3^2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab2f75ce55ef6f903348026271e30796f016851f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'depends/driver-core' into ux500/dt

Conflicts:
	drivers/base/cpu.c
---

ab2f75ce55ef6f903348026271e30796f016851f
diff --cc drivers/base/cpu.c
index 4dabf5077c48,2a0c670c281d..adf937bf4091
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@@ -240,10 -222,11 +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);