]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.3/boards' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 19:06:45 +0000 (11:06 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 20 Dec 2011 19:06:45 +0000 (11:06 -0800)
commitba425b8b7fe10b6a73a61521175e2c01377b4899
treeee244dc2ab332c14f089c6e3db7d2b2b4b1055a7
parentc7aa8dcf42bd9c3ee4fd14474d45e3f2c27dd796
parentbb6e8fb30b836ca3ac43697c886e1385eaa2bba6
Merge branch 'for-3.3/boards' into for-next

Conflicts:
arch/arm/mach-tegra/board-harmony-pcie.c
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