tree 0d1810bce95fc46505ee7ab529e7795c23ef9c80
parent 71019c350aca8fe650246988e64bfd2c89192180
parent 2e058a6fb004a6b6c3eb6a219ae408f83b670598
author Linus Torvalds <torvalds@linux-foundation.org> 1241536996 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241536996 -0700

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:
  mvsdio: fix CONFIG_PM=y build
  mmci: fix crash with debug enabled
  sdhci: catch ADMA errors
  mmc: increase power up delay
  sdhci-pci: bad error handling in probe function
  mmc_block: be prepared for oversized requests