David S. Miller 6a7ebdf2fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-14 07:56:40 -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

…

dw_mmc.c

mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume

2011-05-24 23:53:56 -04:00

dw_mmc.h

…

imxmmc.c

…

imxmmc.h

…

jz4740_mmc.c

…

Kconfig

mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver

2011-05-24 23:54:00 -04:00

Makefile

mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver

2011-05-24 23:54:00 -04:00

mmc_spi.c

…

mmci.c

ARM: 6980/1: mmci: use StartBitErr to detect bad connections

2011-07-06 20:46:04 +01:00

mmci.h

ARM: 6980/1: mmci: use StartBitErr to detect bad connections

2011-07-06 20:46:04 +01:00

msm_sdcc.c

…

msm_sdcc.h

…

mvsdio.c

…

mvsdio.h

…

mxcmmc.c

…

mxs-mmc.c

…

of_mmc_spi.c

mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c

2011-06-18 22:18:00 -04:00

omap_hsmmc.c

mmc: omap_hsmmc: use original sg_len for dma_unmap_sg

2011-06-25 18:51:28 -04:00

omap.c

…

pxamci.c

…

pxamci.h

…

s3cmci.c

…

s3cmci.h

…

sdhci-cns3xxx.c

…

sdhci-dove.c

…

sdhci-esdhc-imx.c

…

sdhci-esdhc.h

…

sdhci-of-core.c

…

sdhci-of-esdhc.c

…

sdhci-of-hlwd.c

…

sdhci-of.h

…

sdhci-pci.c

mmc: sdhci: Fix read-only detection with JMicron 388 chip

2011-05-24 21:02:42 -04:00

sdhci-pltfm.c

…

sdhci-pltfm.h

…

sdhci-pxa.c

mmc: sdhci-pxa: Add quirks for DMA/ADMA to match h/w

2011-05-24 23:54:00 -04:00

sdhci-s3c.c

…

sdhci-spear.c

…

sdhci-tegra.c

…

sdhci.c

mmc: sdhci: Auto-CMD23 fixes.

2011-05-25 16:52:26 -04:00

sdhci.h

mmc: sdhci: Auto-CMD23 support.

2011-05-25 16:51:40 -04:00

sdricoh_cs.c

…

sh_mmcif.c

mmc: add runtime and system power-management support to the MMCIF driver

2011-05-24 23:53:51 -04:00

sh_mobile_sdhi.c

mmc: sdhi: DMA slave ID 0 is invalid

2011-06-25 18:52:20 -04:00

tifm_sd.c

…

tmio_mmc_dma.c

net: remove mm.h inclusion from netdevice.h

2011-06-21 19:17:20 -07:00

tmio_mmc_pio.c

mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling

2011-06-25 18:52:15 -04:00

tmio_mmc.c

mmc: Use device platform_data to retrieve tmio_mmc platform bits

2011-05-26 19:44:59 +02:00

tmio_mmc.h

mmc: tmio: runtime suspend the controller, where possible

2011-05-24 23:53:55 -04:00

ushc.c

…

via-sdmmc.c

…

vub300.c

mmc: vub300: fix null dereferences in error handling

2011-06-18 22:17:51 -04:00

wbsd.c

…

wbsd.h

…