Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <[email protected]>
Mon, 13 Jul 2009 21:38:27 +0000 (23:38 +0200)
committerWolfgang Denk <[email protected]>
Mon, 13 Jul 2009 21:38:27 +0000 (23:38 +0200)

Trivial merge