Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Tue, 30 Dec 2014 17:17:18 +0000 (12:17 -0500)
committerTom Rini <trini@ti.com>
Tue, 30 Dec 2014 17:17:18 +0000 (12:17 -0500)
commit5523cc2b8aa01c81c1df476e4e466d418510eae3
treeebd59e72a6cb4c0f6b56aee8938bc3309ec0dad0
parentf23041a38afd302db862fbbceb81b05590579c40
parent87e47e905887b91c0505495cc6bbab70ba266d51
Merge branch 'master' of git://denx.de/git/u-boot-imx