From: Tom Rini <trini@konsulko.com>
Date: Wed, 1 Nov 2017 13:32:14 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2025.01-rc5-pxa1908~5454
X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=a0cdb534e121185a72c881e76fa802486eba0f4f;p=u-boot.git

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

a0cdb534e121185a72c881e76fa802486eba0f4f