Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 28 Oct 2009 20:50:09 +0000 (21:50 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 28 Oct 2009 20:50:09 +0000 (21:50 +0100)

Trivial merge