Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 12 Jul 2013 11:20:35 +0000 (13:20 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 12 Jul 2013 11:20:35 +0000 (13:20 +0200)
commitefc284e32503b240dbd35c6e8b8d098d702b4be7
tree6331525bc0342e3f3fa0615905851a8a5673142e
parentd035fcf9b6a5a0d7ce8d3d5f3ef960618deea47e
parenta3f170cdbf7ae0bd24c94c2f46725699bbd69f05
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'