Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Sun, 24 Apr 2011 22:58:45 +0000 (00:58 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 24 Apr 2011 22:58:45 +0000 (00:58 +0200)
commitf02efacc515e35695e52ecd08762835c8a74a463
treef4c9cf3a9510842e296d3f72775980e58657e155
parente22ba10107fb2ad4c24634af484363e5dcd65312
parenta90b9575f3ff71de58672295504e9ebaa8f051b4
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash