]> 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>
Fri, 9 Sep 2011 01:44:26 +0000 (11:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 01:44:26 +0000 (11:44 +1000)
commitfe8608aaf4688a725680af0227251364b00ba2bf
treec2da2aa2fe1392ab11219e244b4c13fe51c3ea7f
parent90b3e3322fe6443c2b1e6a0fd22a35e4c420b2c7
parentea754946551b676d552493a501dcbd751ee679a5
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/plat-mxc/devices/platform-pata_imx.c
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikasb.c
arch/arm/mach-mx5/mx51_efika.c