Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Thu, 19 Jun 2008 20:58:36 +0000 (22:58 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 19 Jun 2008 20:58:36 +0000 (22:58 +0200)

Trivial merge