]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 00:58:02 +0000 (11:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 00:58:02 +0000 (11:58 +1100)
commitabeb3e8e27c212473ed086f5a052ae2cd65efeaf
tree193dbe6ad1110675b3f4b5fdd490f37c1cbb4e59
parent183e156b6b8cef9168807522405e029bcde0b52c
parent2e35cf8e395cd42174a68ef6c9c3ea31ecadd712
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/include/mach/entry-macro.S
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/include/mach/entry-macro.S