Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-16 16:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
429e3861f9
linux/drivers/mmc/host
History
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 mmc: at91_mci: Don't include asm/mach/mmc.h 2009-10-22 08:22:25 +09:00
atmel-mci-regs.h atmel-mci: add MCI2 register definitions 2009-06-13 22:43:01 +02:00
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: use SG_MITER_TO_SG/SG_MITER_FROM_SG 2009-07-31 12:28:46 +02: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 cpufreq support 2009-12-15 08:53:34 -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 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 spi: prefix modalias with "spi:" 2009-09-23 07:39:43 -07:00
mmci.c ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk 2010-02-21 22:21:17 +00:00
mmci.h ARM: 5721/1: MMCI enable the use of a regulator 2009-09-22 20:49:05 +01:00
msm_sdcc.c HTC Dream: mmc compilation fixes 2009-12-10 10:14:34 -08:00
msm_sdcc.h mmc: msm_sdccc: driver for HTC Dream 2009-09-23 07:39:32 -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 mxcmmc: fix error path in mxcmci_probe 2009-12-15 08:53:34 -08:00
of_mmc_spi.c mmc: fix missing module license declaration in of_mmc_spi.c 2009-11-04 22:43:35 -07:00
omap_hsmmc.c Merge branch '7xx-iosplit-plat' with omap-fixes 2009-11-10 18:10:34 -08:00
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 ricoh_mmc: Use suspend_late/resume_early 2009-02-02 20:57:06 +01:00
s3cmci.c s3cmci: convert missed s3c2410_gpio calls to gpiolib calls 2009-12-15 08:53:35 -08:00
s3cmci.h s3cmci: DMA fixes 2009-10-01 16:11:15 -07:00
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: platform driver for SDHCI 2009-06-13 22:42:59 +02:00
sdhci-s3c.c sdhci: Add SDHCI_QUIRK_NO_MULTIBLOCK quirk 2009-06-21 21:00:58 +02:00
sdhci.c sdhci: increase timeout for internal clock stabilization. 2009-09-23 07:39:40 -07: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 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 mmc: Add new via-sdmmc host controller driver 2009-06-21 21:00:59 +02:00
wbsd.c New mail address for Pierre Ossman 2009-04-08 20:14:54 +02:00
wbsd.h