From: Tom Rini <trini@konsulko.com>
Date: Tue, 4 Apr 2017 13:17:08 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-fsl-qoriq
X-Git-Tag: v2017.05-rc1~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=797f165f7ae90a75579ae3df7932d8d1518e8544;p=oweals%2Fu-boot.git

Merge git://git.denx.de/u-boot-fsl-qoriq
---

797f165f7ae90a75579ae3df7932d8d1518e8544