Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorWolfgang Denk <wd@denx.de>
Sat, 24 Apr 2010 19:25:42 +0000 (21:25 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 24 Apr 2010 19:25:42 +0000 (21:25 +0200)
commit6e5fb4eec3702a13770769a5a48a9423aa68ee9c
treefad574d32cea2c5c656e19bc4ac228b0ee7b116b
parenta77034a8dfc7942ca08483138dccdebeacc36826
parent77c1458d130d33704472db9c88d2310c8fc90f4c
Merge branch 'master' of git://git.denx.de/u-boot-mmc