Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 13 Oct 2015 12:37:38 +0000 (08:37 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 13 Oct 2015 12:37:38 +0000 (08:37 -0400)
commit297faccca2235e359012118495b9b73451d54bb9
treef23e413e213e1b8a8bf520c85d96786c487385ab
parentf861f51c4673d35908e4e330a86c81d7d909b51c
parent61903b759aa336d798da49d884467219796817ff
Merge branch 'master' of git://denx.de/git/u-boot-imx