tree d87d969bfc91662e7a90b3c4fcce35acf4a3cdaf
parent 5aa7bece1045c28806ce919099616ebe8fa63325
parent 3f97af5302ee15530411232b464d255eb2ff2ffb
author Tom Rini <trini@ti.com> 1414415322 -0400
committer Tom Rini <trini@ti.com> 1414415322 -0400

Merge branch 'master' of git://git.denx.de/u-boot-imx