From: Tom Rini <trini@ti.com>
Date: Mon, 22 Apr 2013 13:12:16 +0000 (-0400)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
X-Git-Tag: v2013.07-rc1~18^2~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=500bccf84408ad71674b714cd9db3480736ad8e1;p=oweals%2Fu-boot.git

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

500bccf84408ad71674b714cd9db3480736ad8e1