]> 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, 27 Sep 2011 01:27:50 +0000 (11:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 01:27:50 +0000 (11:27 +1000)
commit7ef88ee371370c228531ce1a8020f96dbf0c314e
tree62e0e216d6f66f2974399d6bceda029f7b08e284
parent9b21f6024f71b752d2a0d8b524452dd9f991babb
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile