diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-03-15 21:05:52 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 21:05:52 +0000 |
| commit | 38abdcd0d0689aaca94e740ac67a952c7918caef (patch) | |
| tree | 83051487c15c3a062eb4dbff16c13e517c309a78 /arch/arm/boot | |
| parent | Merge tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc2 (diff) | |
| parent | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc (diff) | |
| download | linux-dev-38abdcd0d0689aaca94e740ac67a952c7918caef.tar.xz linux-dev-38abdcd0d0689aaca94e740ac67a952c7918caef.zip | |
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/boot')
0 files changed, 0 insertions, 0 deletions