]> 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, 4 Oct 2011 00:35:43 +0000 (11:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 00:35:43 +0000 (11:35 +1100)
commita9cd6c91bed9b84f46a69b284dbb301ae0f3e5bb
tree70e5783efbf313ffff67e3d30c671598b1aad88e
parentba71ab25905e5c307c1f450b8d4123965f495077
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile