Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 14 Jan 2013 16:00:02 +0000 (17:00 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 14 Jan 2013 16:00:02 +0000 (17:00 +0100)
commita17617d6553369ba72c080128ed8d0b0c33dfc89
treec8903ddc48e628192c56cc95667f702fd1d77c6e
parent1199c377cf14c240b903e351ab02b3b2cd3800c6
parent11d80af4876b609832856853b63d06a1011bccf1
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'