]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 00:47:30 +0000 (11:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 00:47:30 +0000 (11:47 +1100)
commit8473670eedd1ba14c9b85101ea5fd9141ffb7837
tree3f0b33e92ac0e0f2b703cbdb5339c4539214617a
parent4378cba558f21140b3a51122fb1dad746002bf11
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