Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/cpu.c between commit 2885e25c422f ("driver core: cpu: remove
kernel warning when removing a cpu") from the driver-core.current tree
and commit fad12ac8c8c2 ("CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86
parts") from the driver-core tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/cpu.c
index 23f2c4c,2a0c670..0000000
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@@ -242,7 -224,9 +243,10 @@@ int __cpuinit register_cpu(struct cpu *
  	cpu->node_id = cpu_to_node(num);
  	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);