]> 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, 20 Dec 2011 23:32:29 +0000 (10:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 23:32:29 +0000 (10:32 +1100)
commit2585fd57fb112d9bf50e94b1e2416d4b2e967c08
treee59f914ab4a2f2e829cc66475699d6b782cf70fe
parentb24c9e007b38f588505787dcd87e05bcb55cacbd
parentbdd01cc5544bbf11ac6230a5409dd22021fe4005
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-seaboard.c
arch/arm/mach-tegra/board-trimslice.c
arch/arm/mach-tegra/common.c