From: Linus Torvalds Date: Tue, 6 Feb 2007 22:54:54 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc X-Git-Tag: tegra-9.12.3~16188^2~20 X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=commitdiff_plain;h=2442d3109943bafbdfc4f0495e3d10eeedc8390c;hp=-c 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: (32 commits) mmc: tifm: replace kmap with page_address mmc: sdhci: fix voltage ocr mmc: sdhci: replace kmap with page_address mmc: wbsd: replace kmap with page_address mmc: handle pci_enable_device() return value in sdhci mmc: Proper unclaim in mmc_block mmc: change wbsd mailing list mmc: Graceful fallback for fancy features mmc: Handle wbsd's stupid command list mmc: Allow host drivers to specify max block count mmc: Allow host drivers to specify a max block size tifm_sd: add suspend and resume functionality tifm_core: add suspend/resume infrastructure for tifm devices tifm_7xx1: prettify tifm_7xx1: recognize device 0xac8f as supported tifm_7xx1: switch from workqueue to kthread tifm_7xx1: Merge media insert and media remove functions tifm_7xx1: simplify eject function Add dummy_signal_irq function to save check in ISR Remove unused return value from signal_irq callback ... --- 2442d3109943bafbdfc4f0495e3d10eeedc8390c diff --combined MAINTAINERS index 3d125e7a809,3375ed1a9c0..16c0e15b578 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2791,7 -2791,7 +2791,7 @@@ M: schwidefsky@de.ibm.co P: Heiko Carstens M: heiko.carstens@de.ibm.com M: linux390@de.ibm.com -L: linux-390@vm.marist.edu +L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported @@@ -2799,7 -2799,7 +2799,7 @@@ S390 NETWORK DRIVER P: Frank Pavlic M: fpavlic@de.ibm.com M: linux390@de.ibm.com -L: linux-390@vm.marist.edu +L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported @@@ -2807,7 -2807,7 +2807,7 @@@ S390 ZFCP DRIVE P: Swen Schillig M: swen@vnet.ibm.com M: linux390@de.ibm.com -L: linux-390@vm.marist.edu +L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported @@@ -3647,7 -3647,7 +3647,7 @@@ S: Maintaine W83L51xD SD/MMC CARD INTERFACE DRIVER P: Pierre Ossman M: drzeus-wbsd@drzeus.cx - L: wbsd-devel@list.drzeus.cx + L: linux-kernel@vger.kernel.org W: http://projects.drzeus.cx/wbsd S: Maintained