From: Tom Rini <trini@konsulko.com>
Date: Thu, 30 Aug 2018 14:06:19 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2025.01-rc5-pxa1908~3679
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=4b69e870e94c8db9915e218037529289c27625b3;p=u-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-rockchip
---

4b69e870e94c8db9915e218037529289c27625b3