Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e04d108055f09adbcb4de1fd9ae1b856eabb29e4..bcab816b25f49ae0a6d721da76453606bbe585d3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2986,6 +2986,14 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
 F:     drivers/cpufreq/brcmstb*
 
+BROADCOM STB AVS TMON DRIVER
+M:     Markus Mayer <mmayer@broadcom.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+L:     linux-pm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
+F:     drivers/thermal/broadcom/brcmstb*
+
 BROADCOM STB NAND FLASH DRIVER
 M:     Brian Norris <computersforpeace@gmail.com>
 M:     Kamal Dasu <kdasu.kdev@gmail.com>
@@ -3720,8 +3728,8 @@ F:        drivers/cpuidle/*
 F:     include/linux/cpuidle.h
 
 CRAMFS FILESYSTEM
-W:     http://sourceforge.net/projects/cramfs/
-S:     Orphan / Obsolete
+M:     Nicolas Pitre <nico@linaro.org>
+S:     Maintained
 F:     Documentation/filesystems/cramfs.txt
 F:     fs/cramfs/
 
@@ -5216,7 +5224,7 @@ F:        drivers/video/fbdev/s1d13xxxfb.c
 F:     include/video/s1d13xxxfb.h
 
 ERRSEQ ERROR TRACKING INFRASTRUCTURE
-M:     Jeff Layton <jlayton@poochiereds.net>
+M:     Jeff Layton <jlayton@kernel.org>
 S:     Maintained
 F:     lib/errseq.c
 F:     include/linux/errseq.h
@@ -5404,7 +5412,7 @@ F:        include/scsi/libfcoe.h
 F:     include/uapi/scsi/fc/
 
 FILE LOCKING (flock() and fcntl()/lockf())
-M:     Jeff Layton <jlayton@poochiereds.net>
+M:     Jeff Layton <jlayton@kernel.org>
 M:     "J. Bruce Fields" <bfields@fieldses.org>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
@@ -7550,7 +7558,7 @@ S:        Odd Fixes
 
 KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 M:     "J. Bruce Fields" <bfields@fieldses.org>
-M:     Jeff Layton <jlayton@poochiereds.net>
+M:     Jeff Layton <jlayton@kernel.org>
 L:     linux-nfs@vger.kernel.org
 W:     http://nfs.sourceforge.net/
 T:     git git://linux-nfs.org/~bfields/linux.git