Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorTom Rini <trini@ti.com>
Mon, 22 Apr 2013 13:12:16 +0000 (09:12 -0400)
committerTom Rini <trini@ti.com>
Mon, 22 Apr 2013 13:12:16 +0000 (09:12 -0400)

Trivial merge