From: Tom Rini <trini@konsulko.com>
Date: Sat, 11 Feb 2017 15:38:21 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2017.03-rc2~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308;p=oweals%2Fu-boot.git

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

b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308