kevin/linux
1
Fork 0
Code
d6748066ad
linux/drivers/mmc/host
History
Linus Torvalds d6748066ad Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
  MIPS: O32: Provide definition of registers ta0 .. ta3.
  MIPS: perf: Add Octeon support for hardware perf.
  MIPS: perf: Add support for 64-bit perf counters.
  MIPS: perf: Reorganize contents of perf support files.
  MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
  MIPS: Add accessor macros for 64-bit performance counter registers.
  MIPS: Add probes for more Octeon II CPUs.
  MIPS: Add more CPU identifiers for Octeon II CPUs.
  MIPS: XLR, XLS: Add comment for smp setup
  MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
  MIPS: JZ4740: GPIO: Simplify IRQ demuxer
  MIPS: JZ4740: Use generic irq chip
  MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
  MIPS: Alchemy: kill au1xxx.h header
  MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
  MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
  MIPS: Alchemy: Redo PCI as platform driver
  MIPS: Alchemy: more base address cleanup
  MIPS: Alchemy: rewrite USB platform setup.
  MIPS: Alchemy: abstract USB block control register access
  ...

Fix up trivial conflicts in:
	arch/mips/alchemy/devboards/db1x00/platform.c
	drivers/ide/Kconfig
	drivers/mmc/host/au1xmmc.c
	drivers/video/Kconfig
	sound/mips/Kconfig
2011-11-03 13:28:14 -07:00
..
at91_mci.c mmc: at91_mci: remove the use of irq_to_gpio 2011-10-26 15:43:27 -04:00
at91_mci.h
atmel-mci-regs.h mmc: atmel-mci: add pdc support and runtime capabilities detection 2011-10-26 15:43:26 -04:00
atmel-mci.c mmc: atmel-mci: fix a potential issue about pending PDC interrupts 2011-10-26 15:43:26 -04:00
au1xmmc.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
bfin_sdh.c
cb710-mmc.c
cb710-mmc.h
davinci_mmc.c mmc: davinci: Add support for set_power callback 2011-09-17 15:53:23 +05:30
dw_mmc.c mmc: dw_mmc: modify DATA register offset 2011-10-26 16:32:25 -04:00
dw_mmc.h mmc: dw_mmc: modify DATA register offset 2011-10-26 16:32:25 -04:00
imxmmc.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
imxmmc.h
jz4740_mmc.c
Kconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
Makefile
mmc_spi.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
mmci.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 2011-10-28 14:16:11 -07:00
mmci.h
msm_sdcc.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
msm_sdcc.h mmc: msm_sdcc: Use MCI_INT_MASK0 for PIO interrupts 2011-10-26 15:43:37 -04:00
mvsdio.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
mvsdio.h
mxcmmc.c Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:11:00 -07:00
mxs-mmc.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
of_mmc_spi.c
omap_hsmmc.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock 2011-11-03 08:05:35 -07:00
omap.c ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:44 +01:00
pxamci.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
pxamci.h
s3cmci.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
s3cmci.h
sdhci-cns3xxx.c
sdhci-dove.c
sdhci-esdhc-imx.c mmc: sdhci-esdhc-imx: add basic imx6q usdhc support 2011-10-26 16:32:10 -04:00
sdhci-esdhc.h
sdhci-of-esdhc.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
sdhci-of-hlwd.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
sdhci-pci.c mmc: sdhci-pci: add flag for devices that can support runtime PM 2011-10-26 16:32:25 -04:00
sdhci-pltfm.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
sdhci-pltfm.h
sdhci-pxav2.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
sdhci-pxav3.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
sdhci-s3c.c mmc: sdhci-s3c: fix potential NULL dereference 2011-10-26 16:32:22 -04:00
sdhci-spear.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
sdhci-tegra.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 2011-10-28 14:16:11 -07:00
sdhci.c mmc: core: Add Power Off Notify Feature eMMC 4.5 2011-10-26 16:32:23 -04:00
sdhci.h mmc: sdhci-pci: add runtime pm support 2011-10-26 16:32:20 -04:00
sdricoh_cs.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
sh_mmcif.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
sh_mobile_sdhi.c mmc: Add module.h to drivers/mmc users assuming implicit presence. 2011-10-26 16:32:19 -04:00
tifm_sd.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
tmio_mmc_dma.c
tmio_mmc_pio.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
tmio_mmc.c mmc: irq: Remove IRQF_DISABLED 2011-10-26 16:32:16 -04:00
tmio_mmc.h mmc: tmio: Provide separate interrupt handlers 2011-10-26 15:43:36 -04:00
ushc.c
via-sdmmc.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
vub300.c
wbsd.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
wbsd.h