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)

Trivial merge