Merge branch 'tegra/soc' into next/boards
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jan 2012 23:09:14 +0000 (23:09 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 6 Jan 2012 23:09:14 +0000 (23:09 +0000)
commite067096c8d57d191f29d734cd5692695c95cc36e
treee1c200404c3ed3730d04837113d59ca898eb483a
parent1fc3eb81100c3f3cd44e706e54390151b0f1ce74
parente5570bbc9c06634cfac94e06ac1432b53d8595e5
Merge branch 'tegra/soc' into next/boards

Conflicts:
arch/arm/mach-tegra/board-harmony-pcie.c

To fix an internal merge conflict between the tegra/soc and tegra/boards
branches.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-harmony-pinmux.c
arch/arm/mach-tegra/board-paz00-pinmux.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-seaboard-pinmux.c
arch/arm/mach-tegra/board-trimslice-pinmux.c