tree b6c4eba6b5a1070a673159f14472de741535eb79
parent baaea1dc0befb7b64e6dbf2d1469d0a296a79e54
parent a650031a6bd16cb6789da9b3c27fc97341239f12
author Linus Torvalds <torvalds@linux-foundation.org> 1222025925 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222025925 -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:
  mmc_test: initialize mmc_test_lock statically
  mmc_block: handle error from mmc_register_driver()
  atmel-mci: Set MMC_CAP_NEEDS_POLL if no detect_pin
  atmel-mci: Fix bogus debugfs file size
  atmel-mci: Fix memory leak in atmci_regs_show
  atmel-mci: debugfs: enable clock before dumping regs
  tmio_mmc: fix compilation with debug enabled