diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:05:52 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:05:52 -0400 |
| commit | 38abdcd0d0689aaca94e740ac67a952c7918caef (patch) | |
| tree | 83051487c15c3a062eb4dbff16c13e517c309a78 /arch/arm/mach-s5pc100/setup-i2c0.c | |
| parent | 709baa67c676a187a63c0f0f40efceb3fb1eef72 (diff) | |
| parent | 61b80086a525c8a6081257ae40da5dee2bcaee16 (diff) | |
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>
Diffstat (limited to 'arch/arm/mach-s5pc100/setup-i2c0.c')
0 files changed, 0 insertions, 0 deletions