original_kernel/drivers/mmc/host
Linus Torvalds b171aa2770 Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi/amba_pl022: Fix probe and remove hook section annotations.
  spi/mpc5121: change annotations for probe and remove functions
  spi/bitbang: reinitialize transfer parameters for every message
  spi/spi-gpio: add support for controllers without MISO or MOSI pin
  spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes
  SPI100k: Fix 8-bit and RX-only transfers
  spi/mmc_spi: mmc_spi adaptations for SPI bus locking API
  spi/mmc_spi: SPI bus locking API, using mutex

Fix trivial conflict in drivers/spi/mpc512x_psc_spi.c due to 'struct
of_device' => 'struct platform_device' rename and __init/__exit to
__devinit/__devexit fix.
2010-08-14 11:54:09 -07:00
..
Kconfig Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-08-13 18:06:37 -07:00
Makefile Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-08-13 18:06:37 -07:00
at91_mci.c
atmel-mci-regs.h
atmel-mci.c
au1xmmc.c
bfin_sdh.c
cb710-mmc.c
cb710-mmc.h
davinci_mmc.c
imxmmc.c
imxmmc.h
jz4740_mmc.c
mmc_spi.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2010-08-14 11:54:09 -07:00
mmci.c
mmci.h
msm_sdcc.c Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-08-13 18:06:37 -07:00
msm_sdcc.h Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-08-12 10:07:32 -07:00
mvsdio.c
mvsdio.h
mxcmmc.c
of_mmc_spi.c
omap.c
omap_hsmmc.c omap_hsmmc: add erase capability 2010-08-12 08:43:30 -07:00
pxamci.c
pxamci.h
s3cmci.c
s3cmci.h
sdhci-cns3xxx.c sdhci-pltfm: add support for CNS3xxx SoC devices 2010-08-11 08:59:03 -07:00
sdhci-of-core.c Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -07:00
sdhci-of-esdhc.c
sdhci-of-hlwd.c
sdhci-of.h
sdhci-pci.c mmc: add ricoh e822 pci id 2010-08-11 08:59:05 -07:00
sdhci-pltfm.c sdhci-pltfm: add support for CNS3xxx SoC devices 2010-08-11 08:59:03 -07:00
sdhci-pltfm.h sdhci-pltfm: add support for CNS3xxx SoC devices 2010-08-11 08:59:03 -07:00
sdhci-s3c.c sdhci-s3c: add support for new card detection methods 2010-08-11 08:59:05 -07:00
sdhci-spear.c
sdhci.c sdhci: add auto CMD12 support for eSDHC driver 2010-08-11 08:59:05 -07:00
sdhci.h sdhci: add auto CMD12 support for eSDHC driver 2010-08-11 08:59:05 -07:00
sdricoh_cs.c
sh_mmcif.c
tifm_sd.c
tmio_mmc.c
tmio_mmc.h
via-sdmmc.c
wbsd.c
wbsd.h