OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
original_kernel/drivers/mmc/host
History
Uwe Kleine-König 2dcf78c0ee Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD 
There are some more conflicts than detected by git, namely support for
the newly added cpuimx machines needed to be converted to dynamic device
registration.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Conflicts:
	arch/arm/mach-imx/Makefile
	arch/arm/mach-imx/devices.c
	arch/arm/mach-imx/devices.h
	arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
	arch/arm/mach-mx2/Kconfig
	arch/arm/mach-mx25/Makefile
	arch/arm/mach-mx25/devices.c
	arch/arm/plat-mxc/include/mach/mx25.h
	arch/arm/plat-mxc/include/mach/mxc_nand.h
 		2010-07-26 14:27:25 +02:00
..
Kconfig sdhci-spear: ST SPEAr based SDHCI controller glue 2010-05-27 09:12:40 -07:00
Makefile sdhci-spear: ST SPEAr based SDHCI controller glue 2010-05-27 09:12:40 -07:00
at91_mci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
atmel-mci-regs.h
…
atmel-mci.c mmc: atmel-mci: Add support for SDIO interrupts 2010-05-27 09:12:39 -07:00
au1xmmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
bfin_sdh.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
cb710-mmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
cb710-mmc.h
…
davinci_mmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
imxmmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
imxmmc.h
…
mmc_spi.c
…
mmci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
mmci.h
…
msm_sdcc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
msm_sdcc.h
…
mvsdio.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
mvsdio.h
…
mxcmmc.c Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD 2010-07-26 14:27:25 +02:00
of_mmc_spi.c
…
omap.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
omap_hsmmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
pxamci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
pxamci.h
…
s3cmci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
s3cmci.h
…
sdhci-of-core.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
sdhci-of-esdhc.c sdhci: build fix: rename SDHCI I/O accessor functions 2010-05-27 09:12:40 -07:00
sdhci-of-hlwd.c sdhci: build fix: rename SDHCI I/O accessor functions 2010-05-27 09:12:40 -07:00
sdhci-of.h
…
sdhci-pci.c drivers/mmc/host: use ERR_CAST 2010-05-27 09:12:40 -07:00
sdhci-pltfm.c sdhci-pltfm: do not print errors in case of an extended iomem size 2010-05-27 09:12:39 -07:00
sdhci-s3c.c sdhci: enable multiblock transfers in sdhci-s3c 2010-05-27 09:12:40 -07:00
sdhci-spear.c sdhci-spear: ST SPEAr based SDHCI controller glue 2010-05-27 09:12:40 -07:00
sdhci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
sdhci.h mmc: s3c6410: add new quirk in sdhci driver and update ADMA descriptor build 2010-05-27 09:12:40 -07:00
sdricoh_cs.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
sh_mmcif.c mmc: add support MMCIF for SuperH 2010-05-27 09:12:39 -07:00
tifm_sd.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
tmio_mmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
tmio_mmc.h mmc: add DMA support to tmio_mmc driver, when used on SuperH 2010-05-22 16:51:18 +09:00
via-sdmmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
wbsd.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
wbsd.h
…