Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorWolfgang Denk <wd@denx.de>
Thu, 4 Jun 2009 08:56:09 +0000 (10:56 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 4 Jun 2009 08:56:09 +0000 (10:56 +0200)

Trivial merge