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)
commit500bccf84408ad71674b714cd9db3480736ad8e1
treee91fdb3890025ce542a15e05b954c05b3bbfa41d
parent7fbf93e6b8928119c8b3d87ab55739f50aea5552
parent352ef3f1b613cb711c51ec962d2cc1eafff1bf95
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash