From: Tom Rini <trini@ti.com>
Date: Thu, 4 Apr 2013 16:01:27 +0000 (-0400)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc5fd908d976cfd898e8cbb591e7220ddc8a684a;p=people%2Fms%2Fu-boot.git

Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
---

bc5fd908d976cfd898e8cbb591e7220ddc8a684a