leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13dd0c9767
linux/drivers/mmc/host
History
Linus Torvalds 1685e633b3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes
2010-08-06 12:25:06 -07:00
..
at91_mci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07: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: Add support for SDIO interrupts 2010-05-27 09:12:39 -07:00
au1xmmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
bfin_sdh.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
cb710-mmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07: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 mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
imxmmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
imxmmc.h imxmmc: use readl/writel 2008-12-16 14:58:17 +01:00
jz4740_mmc.c MMC: Add support for the controller on JZ4740 SoCs. 2010-08-05 13:26:18 +01:00
Kconfig MMC: Add support for the controller on JZ4740 SoCs. 2010-08-05 13:26:18 +01:00
Makefile MMC: Add support for the controller on JZ4740 SoCs. 2010-08-05 13:26:18 +01:00
mmc_spi.c of: refactor of_modalias_node() and remove explicit match table. 2010-07-05 16:14:52 -06:00
mmci.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-03 14:31:24 -07:00
mmci.h ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants 2010-07-29 15:40:32 +01:00
msm_sdcc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
msm_sdcc.h mmc: msm_sdcc: Fix bug where busclk expiry timer was not properly disabled 2010-03-18 13:37:07 -07:00
mvsdio.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
mvsdio.h mmc: SDIO driver for Marvell SoCs 2009-03-24 21:30:03 +01:00
mxcmmc.c mxcmmc: convert to pm_ops and enable/disable clock 2010-07-26 14:29:21 +02:00
of_mmc_spi.c of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
omap_hsmmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
omap.c omap: remove BUG_ON for disabled interrupts 2010-06-04 15:21:45 -07:00
pxamci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
pxamci.h
s3cmci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
s3cmci.h s3cmci: DMA fixes 2009-10-01 16:11:15 -07:00
sdhci-of-core.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
sdhci-of-esdhc.c sdhci: build fix: rename SDHCI I/O accessor functions 2010-05-27 09:12:40 -07:00
sdhci-of-hlwd.c sdhci: build fix: rename SDHCI I/O accessor functions 2010-05-27 09:12:40 -07:00
sdhci-of.h sdhci-of: add support for the wii sdhci controller 2009-12-17 15:45:32 -08:00
sdhci-pci.c drivers/mmc/host: use ERR_CAST 2010-05-27 09:12:40 -07:00
sdhci-pltfm.c sdhci-pltfm: do not print errors in case of an extended iomem size 2010-05-27 09:12:39 -07:00
sdhci-s3c.c sdhci-s3c: add missing remove function 2010-07-20 16:25:41 -07:00
sdhci-spear.c sdhci-spear: ST SPEAr based SDHCI controller glue 2010-05-27 09:12:40 -07:00
sdhci.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
sdhci.h mmc: s3c6410: add new quirk in sdhci driver and update ADMA descriptor build 2010-05-27 09:12:40 -07:00
sdricoh_cs.c pcmcia: remove cs_types.h 2010-07-30 21:07:39 +02:00
sh_mmcif.c sh: prepare MMCIF driver header file 2010-05-31 13:11:41 +09:00
tifm_sd.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
tmio_mmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
tmio_mmc.h mmc: add DMA support to tmio_mmc driver, when used on SuperH 2010-05-22 16:51:18 +09:00
via-sdmmc.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
wbsd.c mmc: remove the "state" argument to mmc_suspend_host() 2010-05-27 09:12:40 -07:00
wbsd.h