From: Tom Rini <trini@konsulko.com>
Date: Fri, 8 Dec 2017 14:32:10 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2025.01-rc5-pxa1908~5264
X-Git-Url: http://git.dujemihanovic.xyz/repo?a=commitdiff_plain;h=48f0e6bb376942414320a8a086a641c9f73d1745;p=u-boot.git

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

48f0e6bb376942414320a8a086a641c9f73d1745