]> 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, 13 Sep 2011 01:54:47 +0000 (11:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 01:54:47 +0000 (11:54 +1000)
commit0d83e920bd996e93aae14e461c72541cbf120fd8
tree924d55c897a0a500fcca620c463bc2fcaabfa5ff
parent83b658471e9aad1ccc181b0475257bc7164d6c25
parentea754946551b676d552493a501dcbd751ee679a5
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile