diff --git a/[refs] b/[refs] index a66481350ebd..69425da80439 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fc26e36acce714ca26b576e3e6862887fa130d3 +refs/heads/master: 5daa2963f8bd51c161d5b244e439e0c9fdec358b diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6504fb916a15..7d10f06d0889 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2204,7 +2204,6 @@ F: drivers/scsi/lpfc/ ENE CB710 FLASH CARD READER DRIVER P: Michał Mirosław M: mirq-linux@rere.qmqm.pl -L: linux-kernel@vger.kernel.org S: Maintained F: drivers/misc/cb710/ F: drivers/mmc/host/cb710-mmc.* @@ -3480,13 +3479,11 @@ P: Vegard Nossum M: vegardno@ifi.uio.no P Pekka Enberg M: penberg@cs.helsinki.fi -L: linux-kernel@vger.kernel.org S: Maintained KMEMLEAK P: Catalin Marinas M: catalin.marinas@arm.com -L: linux-kernel@vger.kernel.org S: Maintained F: Documentation/kmemleak.txt F: include/linux/kmemleak.h @@ -4306,7 +4303,6 @@ F: drivers/video/omap/ OMAP MMC SUPPORT P: Jarkko Lavinen M: jarkko.lavinen@nokia.com -L: linux-kernel@vger.kernel.org L: linux-omap@vger.kernel.org S: Maintained F: drivers/mmc/host/*omap* @@ -4588,7 +4584,6 @@ P: Paul Mackerras M: paulus@samba.org P: Ingo Molnar M: mingo@elte.hu -L: linux-kernel@vger.kernel.org S: Supported PERSONALITY HANDLING