From: Linus Torvalds Date: Tue, 5 May 2009 15:23:16 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=37ecfd807b82bf547429fe1376e1fe7000ba7cff;p=linux.git Merge branch 'for-linus' of git://git./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 --- 37ecfd807b82bf547429fe1376e1fe7000ba7cff