]> 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>
Fri, 30 Sep 2011 00:10:08 +0000 (10:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 00:10:08 +0000 (10:10 +1000)
commitaaf953f25cc40a9e5313f25ef67ecd7e46d03890
tree369071a9780182b394551069cedb69be36442750
parent167c03881bd4ca09956fb6065319d6bd68bc504b
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile