From: Tom Rini <trini@konsulko.com>
Date: Mon, 1 Aug 2016 00:31:13 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2016.09-rc2~154
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=26fb8db0f4d1e7c118b5e8f3a8849f359b91c166;p=oweals%2Fu-boot.git

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

26fb8db0f4d1e7c118b5e8f3a8849f359b91c166