www.infradead.org Git - users/hch/dma-mapping.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 21 Sep 2008 19:38:45 +0000 (12:38 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 21 Sep 2008 19:38:45 +0000 (12:38 -0700)

* '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

		1	2
drivers/mmc/card/block.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge