From: Tom Rini <trini@konsulko.com>
Date: Mon, 15 Jun 2015 12:31:11 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-marvell
X-Git-Tag: v2015.10~1155
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b48b69ba10fd1fd1f0de73220438ba8052fc2a33;p=bsp%2Fu-boot.git

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

b48b69ba10fd1fd1f0de73220438ba8052fc2a33