From: Tom Rini <trini@konsulko.com>
Date: Thu, 23 Jul 2015 15:46:05 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-uniphier
X-Git-Tag: v2015.10-rc1~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=413978d118bb7d7b0a8488d97d802f2899cd81ce;p=thirdparty%2Fu-boot.git

Merge git://git.denx.de/u-boot-uniphier
---

413978d118bb7d7b0a8488d97d802f2899cd81ce