tree 3d7988d53b48e0783223b79653115085d74c278f
parent 017f51788ffdc16b0168143e38ea2c1f3551d983
parent b6018958a57f6621d6979c4384e42a3df636beed
author Linus Torvalds <torvalds@linux-foundation.org> 1233631454 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233631454 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  pxamci: enable DMA for write ops after CMD/RESP
  pxamci: replace #ifdef CONFIG_PXA27x with if (cpu_is_pxa27x())
  ricoh_mmc: Use suspend_late/resume_early
  mmci: Add support for ST Micro derivate
  mmc: Add a MX2/MX3 specific SDHC driver