Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Wed, 10 Jun 2015 14:55:49 +0000 (10:55 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 10 Jun 2015 14:55:49 +0000 (10:55 -0400)
commitb2016133edec9ece02dca7881e2e0c059d2b421c
treed625b7cbb93cccebfd689b8931939e1083ece3a0
parent204bb1eab6df70884b2ef582db735f33a939d63e
parent0751b138064db28f0866f0c2439afb8b3975180c
Merge branch 'master' of git.denx.de/u-boot-sunxi