]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 09:53:35 +0000 (19:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 09:53:35 +0000 (19:53 +1000)
Conflicts:
arch/arm/mach-tegra/devices.c


Trivial merge