linux-stable-rt/drivers/mmc/host
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
Kconfig
Makefile
at91_mci.c
at91_mci.h
atmel-mci-regs.h
atmel-mci.c
au1xmmc.c
bfin_sdh.c
cb710-mmc.c
cb710-mmc.h
davinci_mmc.c
dw_mmc.c
dw_mmc.h
imxmmc.c
imxmmc.h
jz4740_mmc.c
mmc_spi.c
mmci.c
mmci.h
msm_sdcc.c
msm_sdcc.h
mvsdio.c
mvsdio.h
mxcmmc.c
mxs-mmc.c
of_mmc_spi.c
omap.c
omap_hsmmc.c
pxamci.c
pxamci.h
s3cmci.c
s3cmci.h
sdhci-cns3xxx.c
sdhci-dove.c
sdhci-esdhc-imx.c
sdhci-esdhc.h
sdhci-of-esdhc.c
sdhci-of-hlwd.c
sdhci-pci.c
sdhci-pltfm.c
sdhci-pltfm.h
sdhci-pxav2.c
sdhci-pxav3.c
sdhci-s3c.c
sdhci-spear.c
sdhci-tegra.c
sdhci.c
sdhci.h
sdricoh_cs.c
sh_mmcif.c
sh_mobile_sdhi.c
tifm_sd.c
tmio_mmc.c
tmio_mmc.h
tmio_mmc_dma.c
tmio_mmc_pio.c
ushc.c
via-sdmmc.c
vub300.c
wbsd.c
wbsd.h