Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 26 May 2015 14:38:01 +0000 (10:38 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 26 May 2015 14:38:01 +0000 (10:38 -0400)
commit9bea236b3402a262772b66d055ec6431cbd3ba87
tree8347dda9cb6ec9ad0d1bb15040257e01f8f31fc0
parentd43e15421014c17b90c3e288e3eff18ad8aaf346
parent1022b85cb0e143b4f3a8e6c7d9258d516920d464
Merge branch 'master' of git://denx.de/git/u-boot-imx