]> 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)
commitea24340b0bb01bebc4dafa384f4aab12b7dbdf2f
treee1c200404c3ed3730d04837113d59ca898eb483a
parent5631aa237cf6615dba0903d7fefa8c27fd037a26
parent3f9c13c5c1d2b43e4642481efd11f885332d1684
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