From: Tom Rini <trini@konsulko.com>
Date: Wed, 25 May 2016 16:27:44 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-uniphier
X-Git-Tag: v2025.01-rc5-pxa1908~9426
X-Git-Url: http://git.dujemihanovic.xyz/html/static/gitweb.css?a=commitdiff_plain;h=1b80e79586b0b777afa6a905961000c8495828cc;p=u-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-uniphier
---

1b80e79586b0b777afa6a905961000c8495828cc