Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 17 Sep 2014 21:35:34 +0000 (23:35 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 17 Sep 2014 21:35:34 +0000 (23:35 +0200)
commitc292adae170fa8c27dca75963bdb0a9afc640e57
tree3c1e6bddf7b2b6c6bb92a6329714db0850d05702
parenta7f99bf139b3aaa0d5494693fd0395084355e41a
parent4c97f16911e229f6d5bbea5bee52449916e5fa92
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'