Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...

Conflicts:
	arch/arm/mach-tegra/common.c
	arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

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

diff --cc arch/arm/mach-omap2/pm24xx.c
Simple merge

diff --cc arch/arm/mach-tegra/common.c
index 09dc37fc4299b1d81b7d95880cdd1fa8f68cd6c2,2db20da1d585a98535046fe01e4911c80a108a17..68815ce3f666cc0d7868a5b5e339f765a4b9d8c4
--- 1/arch/arm/mach-tegra/common.c
--- 2/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -27,8 -27,6 +27,7 @@@
  #include <asm/hardware/gic.h>
  
  #include <mach/iomap.h>
- #include <mach/system.h>
 +#include <mach/powergate.h>
  
  #include "board.h"
  #include "clock.h"

diff --cc arch/arm/mach-ux500/devices-common.c
index c3bc094c27e53845751f71df4bc91ca21bf62fc8,898a64517b09ecc1386bd1e2e23d938cc4b6e72c..c5312a4b49f5487a229166de8c28acb3994d6c52
--- 1/arch/arm/mach-ux500/devices-common.c
--- 2/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@@ -47,11 -39,9 +40,11 @@@ dbx500_add_amba_device(struct device *p
  
        dev->dev.platform_data = pdata;
  
-       ret = amba_device_register(dev, &iomem_resource);
 +      dev->dev.parent = parent;
 +
+       ret = amba_device_add(dev, &iomem_resource);
        if (ret) {
-               kfree(dev);
+               amba_device_put(dev);
                return ERR_PTR(ret);
        }