Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 2 Oct 2015 13:38:44 +0000 (09:38 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 2 Oct 2015 13:38:44 +0000 (09:38 -0400)
commitb8d242121dd3c8c418751c37e6f7157cf6428dbf
tree53f1fc557eff2989a27402b7dd226949fd61533f
parent4bbc08f2ecdd16d38f933f202fb1a711fb30d880
parent7daaac5281db0788cde895a0add38ad5195b5be1
Merge branch 'master' of git://denx.de/git/u-boot-imx