Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 7 Apr 2014 17:13:42 +0000 (19:13 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 7 Apr 2014 17:13:42 +0000 (19:13 +0200)
commit284bb60ed6636df3794ba102dd4325a96f1206e9
treead50491bf8f67237dd3083e2f454fcd2fe40b262
parent1e6ad55c058200010bb0649524a2c874e7049242
parent68659d649debc9fb3d8ce21ce4dcfe3a66b63e3a
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'