From: Tom Rini <trini@konsulko.com>
Date: Fri, 13 Jan 2017 02:20:51 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2017.03-rc1~136
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=70c1e0474a9df2c4493b4e2330cc41d3132b4e90;p=oweals%2Fu-boot.git

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

70c1e0474a9df2c4493b4e2330cc41d3132b4e90