Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Thu, 24 Sep 2015 16:28:10 +0000 (12:28 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 24 Sep 2015 16:28:10 +0000 (12:28 -0400)
commit1a9c229bf754c89f42b085451ad506693f326427
tree288106d7498591ac889fa972d0c24fc5c9b811f9
parentd0f30211e9823694c1c2c79f471dbe9d498a40fd
parentf697c2acca9ff02c9b0cf480a4a726ed9626a53a
Merge branch 'master' of git://denx.de/git/u-boot-imx