Merge branch 'next' of git://www.denx.de/git/u-boot-cfi-flash into next
authorWolfgang Denk <wd@denx.de>
Mon, 29 Mar 2010 10:33:16 +0000 (12:33 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 29 Mar 2010 10:33:16 +0000 (12:33 +0200)

Trivial merge