Merge branch 'next' of git://www.denx.de/git/u-boot-cfi-flash into next
authorWolfgang Denk <wd@denx.de>
Fri, 17 Dec 2010 19:11:54 +0000 (20:11 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 17 Dec 2010 19:11:54 +0000 (20:11 +0100)

Trivial merge