From: Tom Rini <trini@konsulko.com>
Date: Fri, 15 Jan 2016 13:11:15 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2016.03-rc1~305
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=782acf7b52db6bec1a796773e3033b4afcd6c9e2;p=oweals%2Fu-boot.git

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

782acf7b52db6bec1a796773e3033b4afcd6c9e2