Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Mon, 23 Mar 2009 09:29:19 +0000 (10:29 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 23 Mar 2009 09:29:19 +0000 (10:29 +0100)

Trivial merge