tree 485484cd9c58631a06f5a2f07abc6db4c2bc6f2f
parent f04b30de3c82528f1ab4c58b3dd4c975f5341901
parent 3ebf74b1de9f94da4291db3ea1ae11c5bedb5784
author Linus Torvalds <torvalds@linux-foundation.org> 1235008515 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235008515 -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:
  omap_hsmmc: Change while(); loops with finite version
  omap_hsmmc: recover from transfer failures
  omap_hsmmc: only MMC1 allows HCTL.SDVS != 1.8V
  omap_hsmmc: card detect irq bugfix
  sdhci: fix led naming
  mmc_test: fix basic read test
  s3cmci: Fix hangup in do_pio_write()
  Revert "sdhci: force high speed capability on some controllers"
  MMC: fix bug - SDHC card capacity not correct