Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 9 Aug 2014 14:48:34 +0000 (16:48 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 9 Aug 2014 14:48:34 +0000 (16:48 +0200)
commit1899fac925eda817e12234aef3d01d354788662e
treebaed464b3d9250361cd85e931a16d87b397cc36f
parente76b933e02e1b38e48754c435e9dba1c0deeb3c6
parent3340eab26d89176dd0bf543e6d2590665c577423
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'