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

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

d0f30211e9823694c1c2c79f471dbe9d498a40fd