1 files changed, 9 insertions, 11 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 44e659530910..411b0d04f69b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2657,9 +2657,12 @@ S:	Maintained
 F:      drivers/media/video/gspca/
 
 HARDWARE MONITORING
+M:      Jean Delvare <khali@linux-fr.org>
+M:      Guenter Roeck <guenter.roeck@ericsson.com>
 L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.org/
-S:      Orphan
+T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
+S:      Maintained
 F:      Documentation/hwmon/
 F:      drivers/hwmon/
 F:      include/linux/hwmon*.h
@@ -2797,11 +2800,6 @@ S:	Maintained
 F:      arch/x86/kernel/hpet.c
 F:      arch/x86/include/asm/hpet.h
 
-HPET:   ACPI
-M:      Bob Picco <bob.picco@hp.com>
-S:      Maintained
-F:      drivers/char/hpet.c
-
 HPFS FILESYSTEM
 M:      Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
 W:      http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
@@ -3414,7 +3412,7 @@ F:	drivers/s390/kvm/
 
 KEXEC
 M:      Eric Biederman <ebiederm@xmission.com>
-W:      http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
+W:      http://kernel.org/pub/linux/utils/kernel/kexec/
 L:      kexec@lists.infradead.org
 S:      Maintained
 F:      include/linux/kexec.h
@@ -4820,6 +4818,7 @@ RCUTORTURE MODULE
 M:      Josh Triplett <josh@freedesktop.org>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 S:      Supported
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 F:      Documentation/RCU/torture.txt
 F:      kernel/rcutorture.c
 
@@ -4844,6 +4843,7 @@ M:	Dipankar Sarma <dipankar@in.ibm.com>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 W:      http://www.rdrop.com/users/paulmck/rclock/
 S:      Supported
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 F:      Documentation/RCU/
 F:      include/linux/rcu*
 F:      include/linux/srcu*
@@ -4851,12 +4851,10 @@ F:	kernel/rcu*
 F:      kernel/srcu*
 X:      kernel/rcutorture.c
 
-REAL TIME CLOCK DRIVER
+REAL TIME CLOCK DRIVER (LEGACY)
 M:      Paul Gortmaker <p_gortmaker@yahoo.com>
 S:      Maintained
-F:      Documentation/rtc.txt
-F:      drivers/rtc/
-F:      include/linux/rtc.h
+F:      drivers/char/rtc.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:      Alessandro Zummo <a.zummo@towertech.it>