Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorWolfgang Denk <wd@denx.de>
Fri, 29 Apr 2011 20:45:50 +0000 (22:45 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 29 Apr 2011 20:45:50 +0000 (22:45 +0200)
commita146bcc208127718443a6ca3ad4edc30d289ad9f
tree6b76559a98ead975c671703f91ae8d831677a653
parent1911602b68f9f6cb2b11dde460aa42d17fb1f700
parentabe2c93ffb13d58985503595e0151bf03a4a6c2a
Merge branch 'master' of git://git.denx.de/u-boot-mmc
include/configs/ca9x4_ct_vxp.h