]> 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>
Thu, 22 Sep 2011 01:51:47 +0000 (11:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 01:51:47 +0000 (11:51 +1000)
commitffddaee4134bffa85ea503c3c7ee230d71c0b02e
treefbfb04cb834b6574cb9935ca7b2b97aabb325496
parent2ec97f790b7fd59f721b32aa9f99af6844c86051
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile