]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Sep 2011 01:39:35 +0000 (11:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Sep 2011 01:39:35 +0000 (11:39 +1000)
commit454533920959c5669f86e1f0ceea48debdbe73f5
treeec076e15a1ae9761838061b6413b5466335f8706
parent2740536198de1e234bafe1cc0a87dea871ff1dac
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile