From: Tom Rini <trini@ti.com>
Date: Tue, 30 Dec 2014 14:11:56 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-uniphier
X-Git-Tag: v2015.01~92
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f23041a38afd302db862fbbceb81b05590579c40;p=pandora-u-boot.git

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

f23041a38afd302db862fbbceb81b05590579c40