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