android_kernel_xiaomi_sm8350/drivers/mmc/host
Linus Torvalds ac0f6f927d Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
  ARM: Eliminate decompressor -Dstatic= PIC hack
  ARM: 5958/1: ARM: U300: fix inverted clk round rate
  ARM: 5956/1: misplaced parentheses
  ARM: 5955/1: ep93xx: move timer defines into core.c and document
  ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
  ARM: 5953/1: ep93xx: fix broken build of clock.c
  ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
  ARM: 5949/1: NUC900 add gpio virtual memory map
  ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
  ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
  ARM: make_coherent(): fix problems with highpte, part 2
  MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
  ARM: 5945/1: ep93xx: include correct irq.h in core.c
  ARM: 5933/1: amba-pl011: support hardware flow control
  ARM: 5930/1: Add PKMAP area description to memory.txt.
  ARM: 5929/1: Add checks to detect overlap of memory regions.
  ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
  ARM: 5927/1: Make delimiters of DMA area globally visibly.
  ARM: 5926/1: Add "Virtual kernel memory..." printout.
  ARM: 5920/1: OMAP4: Enable L2 Cache
  ...

Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-03-01 09:15:15 -08:00
..
at91_mci.c
atmel-mci-regs.h
atmel-mci.c mmc: atmel-mci: new MCI2 module support in atmel-mci driver 2009-12-15 08:53:35 -08:00
au1xmmc.c MMC: AU1xMMC: Allow platforms to disable host capabilities 2010-02-27 12:53:19 +01:00
bfin_sdh.c mmc: Blackfin SD Host Controller Driver 2009-12-15 08:53:35 -08:00
cb710-mmc.c
cb710-mmc.h
davinci_mmc.c davinci: mmc: add cpufreq support 2009-12-15 08:53:34 -08:00
imxmmc.c
imxmmc.h
Kconfig sdhci-of: add support for the wii sdhci controller 2009-12-17 15:45:32 -08:00
Makefile sdhci-of: add support for the wii sdhci controller 2009-12-17 15:45:32 -08:00
mmc_spi.c
mmci.c ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk 2010-02-21 22:21:17 +00:00
mmci.h
msm_sdcc.c HTC Dream: mmc compilation fixes 2009-12-10 10:14:34 -08:00
msm_sdcc.h
mvsdio.c
mvsdio.h
mxcmmc.c mxcmmc: fix error path in mxcmci_probe 2009-12-15 08:53:34 -08:00
of_mmc_spi.c
omap_hsmmc.c
omap.c mmci-omap: remove bogus check for host->iclk 2009-12-15 08:53:34 -08:00
pxamci.c const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
pxamci.h
ricoh_mmc.c
s3cmci.c s3cmci: convert missed s3c2410_gpio calls to gpiolib calls 2009-12-15 08:53:35 -08:00
s3cmci.h
sdhci-of-core.c sdhci-of: add support for the wii sdhci controller 2009-12-17 15:45:32 -08: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 sdhci: add support for the SysKonnect CardBus2SDIO adapter 2009-12-15 08:53:34 -08:00
sdhci-pltfm.c
sdhci-s3c.c
sdhci.c
sdhci.h sdhci: protect header file against multi inclusion 2009-12-17 15:45:31 -08:00
sdricoh_cs.c
tifm_sd.c
tmio_mmc.c mfd: tmio_mmc hardware abstraction for CNF area 2010-01-18 12:30:27 +01:00
tmio_mmc.h mfd: tmio_mmc hardware abstraction for CNF area 2010-01-18 12:30:27 +01:00
via-sdmmc.c
wbsd.c
wbsd.h