]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitca5bcfb39a8688f62c77eca764c71670f59ab728
treee1c200404c3ed3730d04837113d59ca898eb483a
parent0db1d17f4f5d622cdbcd7a32a0d12c2aad1694aa
parent837b80913a08b11ee24b835782ea308acd459440
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