From: Tom Rini <trini@konsulko.com>
Date: Tue, 29 Mar 2016 16:58:45 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2016.05-rc1~120
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0badc648dcb0d0e10db959ffe8ab1b1e156b3724;p=oweals%2Fu-boot.git

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

0badc648dcb0d0e10db959ffe8ab1b1e156b3724