From: Linus Torvalds Date: Thu, 27 May 2010 17:48:46 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 X-Git-Tag: v2.6.35-rc1~34 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=cc106eb35ed4abea675bce0d8fe40a46ff0b4a72;hp=-c Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] fill out file list in s390 MAINTAINERS entry [S390] Add support for LZO-compressed kernels. [S390] cmm: get rid of CMM_PROC config option [S390] cmm: remove superfluous EXPORT_SYMBOLs plus cleanups [S390] dasd: unit check handling during internal cio I/O [S390] cio: unit check handling during internal I/O [S390] ccwgroup: add locking around drvdata access [S390] cio: remove stsch [S390] spp: remove KVM_AWARE_CMF config option [S390] kprobes: forbid probing of stnsm/stosm/epsw [S390] spp: fix compilation for CONFIG_32BIT [S390] atomic: implement atomic64_dec_if_positive [S390] cmm: fix crash on module unload --- cc106eb35ed4abea675bce0d8fe40a46ff0b4a72 diff --combined MAINTAINERS index 8b7eba2de603,cf4db76f8b29..33047a605438 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -4836,6 -4836,9 +4836,9 @@@ W: http://www.ibm.com/developerworks/li S: Supported F: arch/s390/ F: drivers/s390/ + F: fs/partitions/ibm.c + F: Documentation/s390/ + F: Documentation/DocBook/s390* S390 NETWORK DRIVERS M: Ursula Braun @@@ -5004,12 -5007,6 +5007,12 @@@ L: linux-mmc@vger.kernel.or S: Maintained F: drivers/mmc/host/sdhci-s3c.c +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER +M: Viresh Kumar +L: linux-mmc@vger.kernel.org +S: Maintained +F: drivers/mmc/host/sdhci-spear.c + SECURITY SUBSYSTEM M: James Morris L: linux-security-module@vger.kernel.org (suggested Cc:)