Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 ... This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file, and it fixes the build error in the arch/x86/kernel/microcode_core.c file, that the merge did not catch. The microcode_core.c patch was provided by Stephen Rothwell <sfr@canb.auug.org.au> who was invaluable in the merge issues involved with the large sysdev removal process in the driver-core tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2012-01-06 11:42:52 -08:00
..
at91_mci.c
at91_mci.h
atmel-mci-regs.h
atmel-mci.c
au1xmmc.c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
bfin_sdh.c
cb710-mmc.c
cb710-mmc.h
davinci_mmc.c
dw_mmc.c
dw_mmc.h
imxmmc.c
imxmmc.h
jz4740_mmc.c
Kconfig	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2011-11-03 13:28:14 -07:00
Makefile
mmc_spi.c
mmci.c	ARM: 7220/1: mmc: mmci: Fixup error handling for dma	2011-12-18 23:07:22 +00:00
mmci.h
msm_sdcc.c
msm_sdcc.h
mvsdio.c
mvsdio.h
mxcmmc.c	mmc: mxcmmc: fix falling back to PIO	2011-12-10 16:18:34 -05:00
mxs-mmc.c
of_mmc_spi.c
omap_hsmmc.c	mmc: omap_hsmmc: DMA unmap only once in case of MMC error	2011-12-07 23:10:56 -05:00
omap.c
pxamci.c
pxamci.h
s3cmci.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2011-11-04 18:02:25 -07:00
s3cmci.h
sdhci-cns3xxx.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-dove.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-esdhc-imx.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-esdhc.h
sdhci-of-esdhc.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-of-hlwd.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-pci.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-pltfm.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-pltfm.h	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-pxav2.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-pxav3.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-s3c.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci-spear.c
sdhci-tegra.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci.c	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdhci.h	mmc: sdhci: remove "state" argument from sdhci_suspend_host	2011-12-19 15:50:11 -08:00
sdricoh_cs.c
sh_mmcif.c	mmc: sh_mmcif: fix clock gating on platforms with a .down_pwr() method	2011-12-10 16:18:37 -05:00
sh_mobile_sdhi.c
tifm_sd.c
tmio_mmc_dma.c
tmio_mmc_pio.c	mmc: tmio: fix clock gating on platforms with a .set_pwr() method	2011-12-10 16:18:38 -05:00
tmio_mmc.c
tmio_mmc.h
ushc.c	USB: convert some miscellanies drivers to use module_usb_driver()	2011-11-18 09:52:10 -08:00
via-sdmmc.c
vub300.c	mmc: vub300: fix type of firmware_rom_wait_states module parameter	2011-12-19 15:56:09 -08:00
wbsd.c
wbsd.h