tree 3c1e6bddf7b2b6c6bb92a6329714db0850d05702
parent a7f99bf139b3aaa0d5494693fd0395084355e41a
parent 4c97f16911e229f6d5bbea5bee52449916e5fa92
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1410989734 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1410989734 +0200

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'