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)
1  2 
include/configs/ca9x4_ct_vxp.h

Simple merge