From: Tom Rini <trini@konsulko.com>
Date: Mon, 14 May 2018 22:13:59 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.07-rc1~154
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db6b0281eca0dc4a1a40d9ef52d543b09979a1bf;p=oweals%2Fu-boot.git

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

db6b0281eca0dc4a1a40d9ef52d543b09979a1bf