From: Tom Rini <trini@konsulko.com>
Date: Thu, 24 Sep 2015 16:28:02 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-uniphier
X-Git-Tag: v2015.10-rc4~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7bb839d672ed3b28c7740429df4a307482868c5b;p=oweals%2Fu-boot.git

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

7bb839d672ed3b28c7740429df4a307482868c5b