From: Tom Rini <trini@konsulko.com>
Date: Sun, 20 Mar 2016 22:09:34 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-socfpga
X-Git-Tag: v2016.05-rc1~234
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83d95b67d3731e39292d858924ade3be68c167af;p=oweals%2Fu-boot.git

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

83d95b67d3731e39292d858924ade3be68c167af