aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-09-082-17/+16
|\
| * mmc: core: host: only use wakelock for detect workColin Cross2011-09-072-17/+16
* | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-09-061-30/+5
|\ \
| * | OMAP: PM: replace omap_pm_get_dev_context_loss_count with omap_pm_was_context...Axel Haslam2011-09-061-30/+5
| * | Merge commit 'v3.0.1' into linux-omap-3.0Colin Cross2011-08-101-1/+1
| |\ \
| * \ \ Merge commit 'v3.0' into linux-omap-3.0Colin Cross2011-08-101-27/+50
| |\ \ \
* | \ \ \ Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-08-101-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge commit 'v3.0.1' into android-3.0Colin Cross2011-08-101-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | mmc: sdhci-esdhc-imx: SDHCI_CARD_PRESENT does not get clearedShawn Guo2011-08-041-1/+1
| | | |/ | | |/|
* | | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-08-101-27/+50
|\ \ \ \ | |/ / /
| * | | Merge commit 'v3.0' into android-3.0Colin Cross2011-08-101-27/+50
| |\ \ \ | | |/ /
| | * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb...Linus Torvalds2011-07-131-27/+50
| | |\ \
| | | * | mmc: core: Bus width testing needs to handle suspend/resumePhilip Rakity2011-07-131-27/+50
* | | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-07-152-82/+91
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | MMC: eMMC: Sleep before OFFBalaji T K2011-07-141-2/+6
| * | | | MMC: OMAP: replace clk_disable by runtime api in error pathKishore Kadiyala2011-07-141-1/+1
| * | | | OMAP2/3 MMC: initial conversion to runtime PMKevin Hilman2011-07-141-79/+84
| * | | | Merge commit 'v3.0-rc7' into linux-omap-3.0Colin Cross2011-07-122-1/+6
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-07-122-1/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge commit 'v3.0-rc7' into android-3.0Colin Cross2011-07-122-1/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | ARM: 6980/1: mmci: use StartBitErr to detect bad connectionsLinus Walleij2011-07-062-1/+6
| | | |/ | | |/|
* | | | mmc: omap_hsmmc: Add MMC_PM_IGNORE_PM_NOTIFY for builtin deviceDmitry Shmidt2011-07-111-0/+4
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-07-061-2/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | mmc: omap_hsmmc: fix build breakageNishanth Menon2011-07-051-0/+1
| * | | mmc: omap_hsmmc: Skip mmc suspend/resume ops for SDIO deviceDmitry Shmidt2011-07-011-2/+4
| * | | Merge commit 'v3.0-rc5' into linux-omap-3.0Colin Cross2011-06-2911-27/+70
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-06-2911-27/+70
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge commit 'v3.0-rc5' into android-3.0Colin Cross2011-06-2912-29/+80
| |\ \ \ | | | |/ | | |/|
| | * | mmc: queue: bring discard_granularity/alignment into line with SCSIAdrian Hunter2011-06-251-6/+1
| | * | mmc: queue: append partition subname to queue thread nameAdrian Hunter2011-06-253-5/+8
| | * | mmc: core: make erase timeout calculation allow for gated clockAdrian Hunter2011-06-251-1/+1
| | * | mmc: block: switch card to User Data Area when removing the block driverAdrian Hunter2011-06-251-0/+3
| | * | mmc: sdio: reset card during power_restoreDaniel Drake2011-06-251-0/+39
| | * | mmc: sdhi: DMA slave ID 0 is invalidGuennadi Liakhovetski2011-06-251-1/+1
| | * | mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handlingGuennadi Liakhovetski2011-06-251-2/+2
| | * | mmc: omap_hsmmc: use original sg_len for dma_unmap_sgPer Forlin2011-06-251-2/+3
| | * | mmc: omap_hsmmc: fix ocr mask usageAnand Gadiyar2011-06-251-1/+0
| | * | mmc: sdio: fix runtime PM path during driver removalOhad Ben-Cohen2011-06-251-1/+1
| | * | mmc: sdhi: fix module unloadingGuennadi Liakhovetski2011-06-181-1/+2
| | * | mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.cWanlong Gao2011-06-181-0/+5
| | * | mmc: vub300: fix null dereferences in error handlingChris Ball2011-06-181-7/+4
* | | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-06-221-2/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge commit 'v3.0-rc4' into linux-omap-3.0Colin Cross2011-06-221-2/+10
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-06-151-2/+10
| | |\ \
| | | * | ARM: 6894/1: mmci: trigger card detect IRQs on falling and rising edgesLinus Walleij2011-06-061-2/+10
* | | | | mmc: omap_hsmmc: Add Add explicit card-detect processingDmitry Shmidt2011-06-141-0/+29
* | | | | Merge branch 'android-3.0' into android-omap-3.0Colin Cross2011-06-1410-30/+403
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"Colin Cross2011-06-141-6/+1
| * | | sdhci: Always pass clock request value zero to set_clock host opTodd Poynor2011-06-141-1/+1
| * | | mmc: Fix pm_notifier obeying deferred resumeDmitry Shmidt2011-06-141-1/+15