watchdog: shwdt: Conversion to watchdog core.

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1a2f8f5823e07533d5ded2ab793075e247ed2a02..707163365a9308845de03708d43fcbdde8c5452c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1968,10 +1968,7 @@ S:       Maintained
 F:     drivers/net/ethernet/ti/cpmac.c
 
 CPU FREQUENCY DRIVERS
-M:     Dave Jones <[email protected]>
 L:     [email protected]
-W:     http://www.codemonkey.org.uk/projects/cpufreq/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
 S:     Maintained
 F:     drivers/cpufreq/
 F:     include/linux/cpufreq.h
@@ -3592,6 +3589,7 @@ S:        Supported
 F:     drivers/net/wireless/iwlegacy/
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
+M:     Johannes Berg <[email protected]>
 M:     Wey-Yi Guy <[email protected]>
 M:     Intel Linux Wireless <[email protected]>
 L:     [email protected]
@@ -5891,11 +5889,11 @@ F:      Documentation/scsi/st.txt
 F:     drivers/scsi/st*
 
 SCTP PROTOCOL
-M:     Vlad Yasevich <vladislav.yasevich@hp.com>
+M:     Vlad Yasevich <vyasevich@gmail.com>
 M:     Sridhar Samudrala <[email protected]>
 L:     [email protected]
 W:     http://lksctp.sourceforge.net
-S:     Supported
+S:     Maintained
 F:     Documentation/networking/sctp.txt
 F:     include/linux/sctp.h
 F:     include/net/sctp/
@@ -7578,8 +7576,8 @@ F:        Documentation/filesystems/xfs.txt
 F:     fs/xfs/
 
 XILINX AXI ETHERNET DRIVER
-M:     Ariane Keller <[email protected]>
-M:     Daniel Borkmann <[email protected]>
+M:     Anirudha Sarangi <[email protected]>
+M:     John Linn <[email protected]>
 S:     Maintained
 F:     drivers/net/ethernet/xilinx/xilinx_axienet*