Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Sun, 15 Mar 2015 18:31:39 +0000 (14:31 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 15 Mar 2015 18:31:39 +0000 (14:31 -0400)
commita74ef40a471d9d4bffb36a8c89744cf6fd631e6f
treed0e7678f13d9cb3323df2a1c75fa5ef35106e006
parent252ed8729d8a2571faacb6fdb3463df2361a733d
parent6462cdedc20b08ff5aa402a991ec89b3255ba51d
Merge branch 'master' of git://git.denx.de/u-boot-uniphier