Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/drivers/mmc/host
History
Linus Torvalds 7b6181e068 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
  omap: complete removal of machine_desc.io_pg_offst and .phys_io
  omap: UART: fix wakeup registers for OMAP24xx UART2
  omap: Fix spotty MMC voltages
  ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
  serial: omap-serial: fix signess error
  OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
  omap: dma: Fix buffering disable bit setting for omap24xx
  omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
  OMAP3: PM: fix scratchpad memory accesses for off-mode
  omap4: pandaboard: enable the ehci port on pandaboard
  omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
  omap4: pandaboard: remove unused hsmmc definition
  OMAP: McBSP: Remove null omap44xx ops comment
  OMAP: McBSP: Swap CLKS source definition
  OMAP: McBSP: Fix CLKR and FSR signal muxing
  OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
  OMAP: control: move plat-omap/control.h to mach-omap2/control.h
  OMAP: split plat-omap/common.c
  OMAP: McBSP: implement functional clock switching via clock framework
  OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
  ...

Fixed up trivial conflicts in arch/arm/mach-omap2/
{board-zoom-peripherals.c,devices.c} as per Tony
2010-10-25 13:46:56 -07:00
..
at91_mci.c mmc: at91_mci: add missing linux/highmem.h include 2010-09-09 18:57:23 -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 drivers/mmc/host/imxmmc.c: adjust confusing if indentation 2010-09-09 18:57:23 -07:00
imxmmc.h
jz4740_mmc.c MMC: Add support for the controller on JZ4740 SoCs. 2010-08-05 13:26:18 +01:00
Kconfig s5pc110: SDHCI-s3c support on s5pc110 2010-08-20 09:34:55 -07:00
Makefile Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-08-13 18:06:37 -07:00
mmc_spi.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2010-08-14 11:54:09 -07:00
mmci.c ARM: 6370/1: mmci: use _cansleep GPIO functions 2010-09-23 15:02:28 +01:00
mmci.h ARM: 6437/2: mmci: add some register defines for ST Micro variants 2010-10-11 22:54:34 +01:00
msm_sdcc.c Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-08-13 18:06:37 -07:00
msm_sdcc.h Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-08-12 10:07:32 -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.c omap: Keep nwires for omap1 and 2420 MMC controller 2010-10-04 16:58:01 -07:00
omap_hsmmc.c omap4 hsmmc: Update ocr mask for MMC2 for regulator to use 2010-10-01 16:35:28 -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 ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected 2010-09-09 18:57:23 -07:00
s3cmci.h s3cmci: DMA fixes 2009-10-01 16:11:15 -07:00
sdhci-cns3xxx.c sdhci-pltfm: add support for CNS3xxx SoC devices 2010-08-11 08:59:03 -07:00
sdhci-of-core.c Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -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 mmc: add ricoh e822 pci id 2010-08-11 08:59:05 -07:00
sdhci-pltfm.c sdhci-pltfm: add support for CNS3xxx SoC devices 2010-08-11 08:59:03 -07:00
sdhci-pltfm.h sdhci-pltfm: add support for CNS3xxx SoC devices 2010-08-11 08:59:03 -07:00
sdhci-s3c.c mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove 2010-09-26 16:27:05 -04:00
sdhci-spear.c sdhci-spear: ST SPEAr based SDHCI controller glue 2010-05-27 09:12:40 -07:00
sdhci.c sdhci: add no hi-speed bit quirk support 2010-08-20 09:34:55 -07:00
sdhci.h sdhci: add no hi-speed bit quirk support 2010-08-20 09:34:55 -07:00
sdricoh_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +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: fix the use of kunmap_atomic() in tmio_mmc.h 2010-09-09 18:57:23 -07:00
tmio_mmc.h mmc: fix the use of kunmap_atomic() in tmio_mmc.h 2010-09-09 18:57:23 -07: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