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>

diff --cc drivers/base/cpu.c
index 2a0c670c281d14e01725e579da40406b47cda7db,4dabf5077c48575b06a4a25041fca33a8a8fb344..adf937bf40911b39e8c30c001f949ee8612f2cc3
--- 1/drivers/base/cpu.c
--- 2/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);

diff --cc drivers/pci/xen-pcifront.c
Simple merge

diff --cc drivers/pcmcia/ds.c
Simple merge

diff --cc include/linux/hyperv.h
Simple merge

diff --cc scripts/mod/file2alias.c
Simple merge