]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:19:17 +0000 (11:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:19:17 +0000 (11:19 +1100)
commitbcb20d25969d58de57163e7a0af891ddc858b176
tree3f0a704c991ce1d21fc52cf3a3801f1f48f13ec1
parent7afcd7610415a03f70e578bfcef2554a987d9741
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