Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Fri, 22 Feb 2008 12:02:10 +0000 (13:02 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 22 Feb 2008 12:02:10 +0000 (13:02 +0100)

Trivial merge