Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
at91_mci.c	mmc: at91_mci: modify cache flush routines	2010-05-15 12:48:10 -07:00
atmel-mci-regs.h	atmel-mci: add MCI2 register definitions	2009-06-13 22:43:01 +02:00
atmel-mci.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2010-05-21 17:05:46 -07:00
au1xmmc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
bfin_sdh.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
cb710-mmc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
cb710-mmc.h	mmc: Driver for CB710/720 memory card reader (MMC part)	2009-06-13 22:42:58 +02:00
davinci_mmc.c	davinci: MMC: add support for 8bit MMC cards	2010-03-06 11:26:36 -08:00
imxmmc.c	imxmmc: Remove unnecessary semicolons	2009-07-31 12:28:46 +02:00
imxmmc.h	imxmmc: use readl/writel	2008-12-16 14:58:17 +01:00
Kconfig	mfd/mmc: SDHI Kconfig update	2010-03-07 22:17:32 +01:00
Makefile	ricoh_mmc: port from driver to pci quirk	2010-03-06 11:26:36 -08:00
mmc_spi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
mmci.c	ARM: 6033/1: ARM: MMCI: pass max frequency from platform	2010-04-14 16:08:18 +01:00
mmci.h	ARM: 6032/1: ARM: MMCI: support 8bit mode on the ST Micro version	2010-04-14 16:08:17 +01:00
msm_sdcc.c	Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm	2010-05-21 14:38:35 -07:00
msm_sdcc.h	mmc: msm_sdcc: Fix bug where busclk expiry timer was not properly disabled	2010-03-18 13:37:07 -07:00
mvsdio.c	mvsdio: fix handling of partial word at the end of PIO transfer	2009-07-20 16:46:34 -07:00
mvsdio.h	mmc: SDIO driver for Marvell SoCs	2009-03-24 21:30:03 +01:00
mxcmmc.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
of_mmc_spi.c	of: Always use 'struct device.of_node' to get device node pointer.	2010-05-18 16:10:44 -06:00
omap_hsmmc.c	omap hsmmc: fix a bug in card remove scenario	2010-04-07 08:38:03 -07:00
omap.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
pxamci.c	[ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond	2010-05-11 17:25:04 +02:00
pxamci.h	[ARM] pxa: mmc: add 1st host controller support for pxa3xx	2008-01-26 15:07:53 +00:00
s3cmci.c	s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin	2010-03-06 11:26:37 -08:00
s3cmci.h	s3cmci: DMA fixes	2009-10-01 16:11:15 -07:00
sdhci-of-core.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
sdhci-of-esdhc.c	sdhci-of: reorganize driver to support additional hardware	2009-12-17 15:45:31 -08:00
sdhci-of-hlwd.c	sdhci-of: add support for the wii sdhci controller	2009-12-17 15:45:32 -08:00
sdhci-of.h	sdhci-of: add support for the wii sdhci controller	2009-12-17 15:45:32 -08:00
sdhci-pci.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sdhci-pltfm.c	sdhci: platform driver for SDHCI	2009-06-13 22:42:59 +02:00
sdhci-s3c.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sdhci.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sdhci.h	sdhci: protect header file against multi inclusion	2009-12-17 15:45:31 -08:00
sdricoh_cs.c	Merge branch 'master' of ../mmc	2008-12-31 19:56:05 +01:00
tifm_sd.c	mmc: struct device - replace bus_id with dev_name(), dev_set_name()	2008-11-08 21:37:46 +01:00
tmio_mmc.c	tmio_mmc: Balance cell enable()/disable() calls	2010-03-07 22:17:27 +01:00
tmio_mmc.h	tmio_mmc: Keep card-detect interrupts enabled	2010-03-07 22:17:25 +01:00
via-sdmmc.c	mmc: Add new via-sdmmc host controller driver	2009-06-21 21:00:59 +02:00
wbsd.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wbsd.h	mmc: update header file paths	2007-07-26 01:53:31 +02:00