]> 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, 6 Oct 2011 00:14:44 +0000 (11:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 00:14:44 +0000 (11:14 +1100)
commita94e29777a3fda20687217724f7d5eed1d6250c1
tree7af41cc23dbd29f2e224d70814db3c87554dcb8f
parent95b41736d0012ff6dfc4997dccb9b283ed202f81
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile