X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=MAINTAINERS;h=d708702aba2f292b83bc62fb20274d18f3389716;hp=5305dd69095b3b5e7605c6dd3539168d43cc4e77;hb=aaa9b971398f62ab97c1da4f7c352667eb3452c9;hpb=22a60f1951256ed493bf1430f8c3edcb31c0dbaa diff --git a/MAINTAINERS b/MAINTAINERS index 5305dd69095b..d708702aba2f 100644 --- 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