2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
linux-next/drivers/mmc/host
Linus Torvalds 7cc4e87f91 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: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.
2008-10-11 10:09:45 -07:00
..
at91_mci.c mmc: at91_mci: don't use coherent dma buffers 2008-09-02 19:21:38 -07:00
atmel-mci-regs.h atmel-mci: debugfs support 2008-07-27 01:26:17 +02:00
atmel-mci.c atmel-mci: Initialize BLKR before sending data transfer command 2008-10-06 14:26:24 -07:00
au1xmmc.c au1xmmc: raise segment size limit. 2008-08-01 19:04:26 +02:00
imxmmc.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
imxmmc.h mmc: Move host and card drivers to subdirs 2007-05-01 13:04:17 +02:00
Kconfig mfd: have TMIO drivers and subdevices depend on ARM 2008-08-10 23:30:34 +02:00
Makefile mfd: TMIO MMC driver 2008-08-10 23:30:16 +02:00
mmc_spi.c mmc_spi: put signals to low power off fix 2008-07-24 01:27:07 +02:00
mmci.c mmc: remove multiwrite capability 2008-07-15 14:14:49 +02:00
mmci.h mmc: fix sg->page fallout 2007-10-23 20:37:24 +02:00
omap.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
pxamci.c [ARM] pxa: make cpu_is_pxa2* macros more consistent 2008-09-25 09:54:55 +01:00
pxamci.h [ARM] pxa: mmc: add 1st host controller support for pxa3xx 2008-01-26 15:07:53 +00:00
ricoh_mmc.c mmc: extend ricoh_mmc to support Ricoh RL5c476 2008-02-08 09:02:47 +01:00
s3cmci.c s3cmci: attach get_cd host ops 2008-08-17 20:00:22 +02:00
s3cmci.h MMC: S3C24XX: Add platform data for MMC/SD driver 2008-07-15 14:14:47 +02:00
sdhci-pci.c sdhci: handle bug in JMB38x for sizes < 4 bytes 2008-08-01 19:03:35 +02:00
sdhci.c sdhci: check correct return value 2008-08-01 19:03:36 +02:00
sdhci.h sdhci: handle bug in JMB38x for sizes < 4 bytes 2008-08-01 19:03:35 +02:00
sdricoh_cs.c sdricoh_cs: removed unused #include <version.h> 2008-08-17 20:01:35 +02:00
tifm_sd.c mmc: remove multiwrite capability 2008-07-15 14:14:49 +02:00
tmio_mmc.c mfd: TMIO MMC driver 2008-08-10 23:30:16 +02:00
tmio_mmc.h tmio_mmc: fix compilation with debug enabled 2008-09-20 12:11:13 +02:00
wbsd.c mmc: remove multiwrite capability 2008-07-15 14:14:49 +02:00
wbsd.h mmc: update header file paths 2007-07-26 01:53:31 +02:00