From: Tom Rini <trini@konsulko.com>
Date: Sun, 15 Mar 2015 18:31:39 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-uniphier
X-Git-Tag: v2015.04-rc4~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a74ef40a471d9d4bffb36a8c89744cf6fd631e6f;p=oweals%2Fu-boot.git

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

a74ef40a471d9d4bffb36a8c89744cf6fd631e6f