kevin/linux
1
Fork 0
Code
952414505f
linux/drivers/mmc/host
History
Linus Torvalds 952414505f Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 
* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
  ARM: mach-mxs: fix machines' initializers order
  mmc: mxcmmc: explicitly includes mach/hardware.h
  arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
  arm/imx: remove mx27_setup_weimcs() from mx27.h
  arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
  arm/imx: remove mx31_setup_weimcs() from mx31.h
  ARM: tegra: devices.c should include devices.h
  ARM: tegra: cpu-tegra: unexport two functions
  ARM: tegra: cpu-tegra: sparse type fix
  ARM: tegra: dma: staticify some tables and functions
  ARM: tegra: tegra2_clocks: don't export some tables
  ARM: tegra: tegra_powergate_is_powered should be static
  ARM: tegra: tegra_rtc_read_ms should be static
  ARM: tegra: tegra_init_cache should be static
  ARM: tegra: pcie: 0 -> NULL changes
  ARM: tegra: pcie: include board.h
  ARM: tegra: pcie: don't cast __iomem pointers
  ARM: tegra: tegra2_clocks: 0 -> NULL changes
  ARM: tegra: tegra2_clocks: don't cast __iomem pointers
  ARM: tegra: timer: don't cast __iomem pointers
  ...

Fix up trivial conflicts in
  arch/arm/mach-omap2/Makefile,
  arch/arm/mach-u300/{Makefile.boot,core.c}
  arch/arm/plat-{mxc,omap}/devices.c
2011-11-01 20:11:00 -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 mmc: at91_mci: move register header from include/ to drivers/ 2011-07-21 10:35:08 -04:00
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 mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
bfin_sdh.c
cb710-mmc.c
cb710-mmc.h
davinci_mmc.c
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 mmc: sdhci-esdhc-imx: add basic imx6q usdhc support 2011-10-26 16:32:10 -04:00
Makefile mmc: tmio: Fix build error without CONFIG_MMC_SDHI 2011-07-20 17:21:00 -04:00
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 mmc: mmci: implement pre_req() and post_req() 2011-07-20 17:21:11 -04:00
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 mmc: omap_hsmmc: if multiblock reads are broken, disable them 2011-10-27 09:11:28 -04: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 mmc: sdhci: change sdhci-pltfm into a module 2011-07-20 17:20:49 -04:00
sdhci-dove.c mmc: sdhci: change sdhci-pltfm into a module 2011-07-20 17:20:49 -04:00
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 mmc: sdhci: change sdhci-pltfm into a module 2011-07-20 17:20:49 -04:00
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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2011-07-22 14:43:13 -07:00
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 Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
wbsd.c mmc: replace printk with appropriate display macro 2011-10-26 16:32:22 -04:00
wbsd.h