]> 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>
Mon, 12 Sep 2011 01:58:16 +0000 (11:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 01:58:16 +0000 (11:58 +1000)
commitab8f749a77293807ebd4faf8b375b559860cddf3
tree760724008e570b5ea298e99ed441368cd349fb3f
parent62cefc4ce99aa092ecc6a06ef2034eb365e5b620
parentea754946551b676d552493a501dcbd751ee679a5
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile