From: Tom Rini <trini@ti.com>
Date: Mon, 25 Nov 2013 15:42:19 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-net
X-Git-Tag: v2014.01-rc1~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a1326d2da9b2904bc90fb2990f829cb1ecef312;p=pandora-u-boot.git

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

1a1326d2da9b2904bc90fb2990f829cb1ecef312