From: Tom Rini <trini@konsulko.com>
Date: Fri, 18 Aug 2017 22:23:58 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2025.01-rc5-pxa1908~6007
X-Git-Url: http://git.dujemihanovic.xyz/html/static/gitweb.css?a=commitdiff_plain;h=804f1d9938ddbf65848bd9c8868005b8d083a8d1;p=u-boot.git

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

804f1d9938ddbf65848bd9c8868005b8d083a8d1