| commit | 38abdcd0d0689aaca94e740ac67a952c7918caef | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Mar 15 21:05:52 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Mar 15 21:05:52 2012 +0000 |
| tree | 83051487c15c3a062eb4dbff16c13e517c309a78 | |
| 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>