Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b2024938adcf7cf8ad43d6e26fe7a6343acf5161..13902cbe56baa37743af5a62616edb3807a9f54f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -277,7 +277,7 @@ S:  Maintained
 
 ALI1563 I2C DRIVER
 P:     Rudolf Marek
-M:     r.marek@sh.cvut.cz
+M:     r.marek@assembler.cz
 L:     i2c@lm-sensors.org
 S:     Maintained
 
@@ -296,6 +296,13 @@ L: info-linux@geode.amd.com
 W:     http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:     Supported
 
+AMS (Apple Motion Sensor) DRIVER
+P:     Stelian Pop
+M:     stelian@popies.net
+P:     Michael Hanselmann
+M:     linux-kernel@hansmi.ch
+S:     Supported
+
 AMSO1100 RNIC DRIVER
 P:     Tom Tucker
 M:     tom@opengridcomputing.com
@@ -740,7 +747,7 @@ P:  Dave Jones
 M:     davej@codemonkey.org.uk
 L:     cpufreq@lists.linux.org.uk
 W:     http://www.codemonkey.org.uk/projects/cpufreq/
-T:     git kernel.org/pub/scm/linux/kernel/davej/cpufreq.git
+T:     git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
 S:     Maintained
 
 CPUID/MSR DRIVER
@@ -1270,6 +1277,12 @@ L:       linux-nvidia@lists.surfsouth.com
 W:     http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
 S:     Maintained
 
+HID CORE LAYER
+P:     Jiri Kosina
+M:     jkosina@suse.cz
+L:     linux-input@atrey.karlin.mff.cuni.cz
+S:     Maintained
+
 HIGH-SPEED SCC DRIVER FOR AX.25
 P:     Klaus Kudielka
 M:     klaus.kudielka@ieee.org
@@ -1504,8 +1517,10 @@ T:       git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
 S:     Maintained
 
 INOTIFY
-P:     John McCutchan and Robert Love
-M:     ttb@tentacle.dhs.org and rml@novell.com
+P:     John McCutchan
+M:     ttb@tentacle.dhs.org
+P:     Robert Love
+M:     rml@novell.com
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
@@ -1745,6 +1760,13 @@ W:       http://nfs.sourceforge.net/
 W:     http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
 S:     Maintained
 
+KERNEL VIRTUAL MACHINE (KVM)
+P:     Avi Kivity
+M:     avi@qumranet.com
+L:     kvm-devel@lists.sourceforge.net
+W:     kvm.sourceforge.net
+S:     Supported
+
 KEXEC
 P:     Eric Biederman
 M:     ebiederm@xmission.com
@@ -3108,7 +3130,7 @@ USB EHCI DRIVER
 P:     David Brownell
 M:     dbrownell@users.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
-S:     Maintained
+S:     Odd Fixes
 
 USB ET61X[12]51 DRIVER
 P:     Luca Risolia
@@ -3161,11 +3183,11 @@ S:      Maintained
 W:     http://www.one-eyed-alien.net/~mdharm/linux-usb/
 
 USB OHCI DRIVER
-P:     Roman Weissgaerber
-M:     weissg@vienna.at
+P:     David Brownell
+M:     dbrownell@users.sourceforge.net
 L:     linux-usb-users@lists.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
-S:     Maintained
+S:     Odd Fixes
 
 USB OPTION-CARD DRIVER
 P:     Matthias Urlichs
@@ -3427,6 +3449,12 @@ M:       bezaur@gmail.com
 L:     lm-sensors@lm-sensors.org
 S:     Maintained
 
+W83793 HARDWARE MONITORING DRIVER
+P:     Rudolf Marek
+M:     r.marek@assembler.cz
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 W83L51xD SD/MMC CARD INTERFACE DRIVER
 P:     Pierre Ossman
 M:     drzeus-wbsd@drzeus.cx