Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc
into ppc970.osdl.org:/home/torvalds/v2.6/linux Manual merge of arch/arm/Kconfig conflicts
Showing
drivers/mmc/Kconfig
0 → 100644
drivers/mmc/Makefile
0 → 100644
drivers/mmc/mmc.c
0 → 100644
This diff is collapsed.
drivers/mmc/mmc.h
0 → 100644
drivers/mmc/mmc_block.c
0 → 100644
This diff is collapsed.
drivers/mmc/mmc_queue.c
0 → 100644
drivers/mmc/mmc_queue.h
0 → 100644
drivers/mmc/mmc_sysfs.c
0 → 100644
drivers/mmc/mmci.c
0 → 100644
This diff is collapsed.
drivers/mmc/mmci.h
0 → 100644
drivers/mmc/pxamci.c
0 → 100644
This diff is collapsed.
drivers/mmc/pxamci.h
0 → 100644
include/asm-arm/mach/mmc.h
0 → 100644
include/linux/mmc/card.h
0 → 100644
include/linux/mmc/host.h
0 → 100644
include/linux/mmc/mmc.h
0 → 100644
include/linux/mmc/protocol.h
0 → 100644
Please register or sign in to comment