Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 12 Jan 2011 22:55:41 +0000 (23:55 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 12 Jan 2011 22:55:41 +0000 (23:55 +0100)

Trivial merge