From: Tom Rini <trini@konsulko.com>
Date: Wed, 16 Dec 2015 19:50:03 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2016.01-rc3~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35065cdd94a41dee4882b921f9763742e44d1c58;p=oweals%2Fu-boot.git

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

35065cdd94a41dee4882b921f9763742e44d1c58