Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
Arnd Bergmann [Thu, 15 Mar 2012 21:05:52 +0000 (21:05 +0000)]
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>

1  2 
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-tegra/common.c
arch/arm/mach-ux500/devices-common.c

Simple merge
@@@ -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"
@@@ -47,11 -39,9 +40,11 @@@ dbx500_add_amba_device(struct device *p
  
        dev->dev.platform_data = pdata;
  
 +      dev->dev.parent = parent;
 +
-       ret = amba_device_register(dev, &iomem_resource);
+       ret = amba_device_add(dev, &iomem_resource);
        if (ret) {
-               kfree(dev);
+               amba_device_put(dev);
                return ERR_PTR(ret);
        }