Stefan Roese f2302d4430 Fix merge problems ...

Signed-off-by: Stefan Roese <sr@denx.de>

2008-08-06 14:05:38 +02:00

..

atmel_mci.c

Fix merge problems

2008-08-06 14:05:38 +02:00

atmel_mci.h

mmc: Move atmel_mci driver into drivers/mmc

2008-07-10 00:05:52 +02:00

Makefile

mmc: Move atmel_mci driver into drivers/mmc

2008-07-10 00:05:52 +02:00