Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 25 Nov 2012 12:01:58 +0000 (13:01 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 25 Nov 2012 12:01:58 +0000 (13:01 +0100)
commitb8a7c467960ffb4d5a5e1eef5f7783fb6f594542
treeda95eeaa6578048658ff60f20a9b498730c67917
parent3786a942b5892441982f5d8908303f360bac9f8c
parent1d4fd0dc3b45de7b7a706285845ef5b527422014
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'