]> 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, 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)
commit55a9b48dfaffbd38ecf949ed93b59a38362e3da7
tree133c085d98550d84b273949ad156010e03344ad2
parent1067e333bb87d05d00121d2a0d74376f5bf19496
parentb76c0de4c89981c653b1d39d447cbaaeccd8270b
Merge remote-tracking branch 'tegra/for-next'

Conflicts:
arch/arm/mach-tegra/devices.c