From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Mar 2012 21:05:52 +0000 (+0000)
Subject: Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38abdcd0d0689aaca94e740ac67a952c7918caef;p=linux-beck.git

Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2

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>
---

38abdcd0d0689aaca94e740ac67a952c7918caef
diff --cc arch/arm/mach-tegra/common.c
index 09dc37fc4299,2db20da1d585..68815ce3f666
--- a/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 c3bc094c27e5,898a64517b09..c5312a4b49f5
--- a/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;
  
 +	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);
  	}