Merge tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra...

From: Olof Johansson <olof@lixom.net>
Tegra 30 SMP support

I did this as a separate topic branch because it depends on both the
soc and the soc-drivers branch, so it brings both of those in as a base.

This branch contains work to enable SMP support on Tegra30 and reworks
some of the SMP bringup for T20 as well.

It also contains a device tree patch that builds on top of the SMP/clock
changes in the rest of the branch, so it made more sense to apply it
here than deal with the merge conflicts back and forth.

* tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
  ARM: dt: Explicitly configure all serial ports on Tegra Cardhu
  ARM: tegra: support for secondary cores on Tegra30
  ARM: tegra: support for Tegra30 CPU powerdomains
  ARM: tegra: add support for Tegra30 powerdomains
  ARM: tegra: export tegra_powergate_is_powered()
  ARM: tegra: prepare powergate.c for multiple variants
  ARM: tegra: rework Tegra secondary CPU core bringup
  ARM: tegra: functions to access the flowcontroller
  ARM: tegra: initialize Tegra chipid early
  ARM: tegra: export Tegra chipid
  ARM: tegra: cleanup use of chipid register

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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 include/linux/hyperv.h
Simple merge

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