From: Tom Rini <trini@konsulko.com>
Date: Wed, 1 Jul 2015 19:37:56 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-uniphier
X-Git-Tag: v2015.07~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6762ae68887d962e1a4be193672005bdefd3ee32;p=pandora-u-boot.git

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

6762ae68887d962e1a4be193672005bdefd3ee32