Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5305dd69095b3b5e7605c6dd3539168d43cc4e77..d708702aba2f292b83bc62fb20274d18f3389716 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1668,6 +1668,12 @@ M:       sct@redhat.com, akpm@osdl.org
 L:     ext2-devel@lists.sourceforge.net
 S:     Maintained
 
+K8TEMP HARDWARE MONITORING DRIVER
+P:     Rudolf Marek
+M:     r.marek@assembler.cz
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 KCONFIG
 P:     Roman Zippel
 M:     zippel@linux-m68k.org
@@ -2309,8 +2315,8 @@ T:        quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:     Supported
 
 PCI HOTPLUG CORE
-P:     Greg Kroah-Hartman
-M:     gregkh@suse.de
+P:     Kristen Carlson Accardi
+M:     kristen.c.accardi@intel.com
 S:     Supported
 
 PCI HOTPLUG COMPAQ DRIVER