Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Wed, 9 Jul 2014 13:21:51 +0000 (09:21 -0400)
committerTom Rini <trini@ti.com>
Wed, 9 Jul 2014 13:21:51 +0000 (09:21 -0400)
commit22692ec0fbdb455ca16d4d0e27768c6b6deb4243
treed7e64a0e9582e3dd0b3a52261fe5f0110829927e
parent80a7cac033082ec3e106cfcc736a126ec6547d85
parent157f45da91b306d71dbf3a51325352dc11bf16d1
Merge branch 'master' of git://denx.de/git/u-boot-imx