From: Tom Rini <trini@konsulko.com>
Date: Wed, 2 Nov 2016 13:41:20 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2016.11~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fd117389ec7bbd0ce2fbb98ce47c20f5b8a0cfb;p=pandora-u-boot.git

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

7fd117389ec7bbd0ce2fbb98ce47c20f5b8a0cfb