1 files changed, 152 insertions, 18 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 036e31f1d891..cfd26ddccd7a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -382,6 +382,12 @@ L:	linux-laptop@vger.kernel.org
 W:      http://www.canb.auug.org.au/~sfr/
 S:      Supported
 
+APPLE SMC DRIVER
+P:      Nicolas Boichat
+M:      nicolas@boichat.ch
+L:      mactel-linux-devel@lists.sourceforge.net
+S:      Maintained
+
 APPLETALK NETWORK LAYER
 P:      Arnaldo Carvalho de Melo
 M:      acme@ghostprotocols.net
@@ -673,6 +679,7 @@ AUXILIARY DISPLAY DRIVERS
 P:      Miguel Ojeda Sandonis
 M:      maxextreme@gmail.com
 L:      linux-kernel@vger.kernel.org
+W:      http://auxdisplay.googlepages.com/
 S:      Maintained
 
 AVR32 ARCHITECTURE
@@ -700,6 +707,44 @@ P:	Richard Purdie
 M:      rpurdie@rpsys.net
 S:      Maintained
 
+BLACKFIN ARCHITECTURE
+P:     Aubrey Li
+M:     aubrey.li@analog.com
+P:     Bernd Schmidt
+M:     bernd.schmidt@analog.com
+P:     Bryan Wu
+M:     bryan.wu@analog.com
+P:     Grace Pan
+M:     grace.pan@analog.com
+P:     Michael Hennerich
+M:     michael.hennerich@analog.com
+P:     Mike Frysinger
+M:     michael.frysinger@analog.com
+P:     Jane Lv
+M:     jane.lv@analog.com
+P:     Jerry Zeng
+M:     jerry.zeng@analog.com
+P:     Jie Zhang
+M:     jie.zhang@analog.com
+P:     Robin Getz
+M:     robin.getz@analog.com
+P:     Roy Huang
+M:     roy.huang@analog.com
+P:     Sonic Zhang
+M:     sonic.zhang@analog.com
+P:     Yi Li
+M:     yi.li@analog.com
+L:     uclinux-dist-devel@blackfin.uclinux.org
+W:     http://blackfin.uclinux.org
+S:     Supported
+
+BLACKFIN SERIAL DRIVER
+P:     Aubrey Li
+M:     aubrey.li@analog.com
+L:     uclinux-dist-devel@blackfin.uclinux.org
+W:     http://blackfin.uclinux.org
+S:     Supported
+
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
 P:      Thomas Sailer
 M:      t.sailer@alumni.ethz.ch
@@ -733,6 +778,13 @@ M:	tigran@aivazian.fsnet.co.uk
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+BLACKFIN I2C TWI DRIVER
+P:      Sonic Zhang
+M:      sonic.zhang@analog.com
+L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
+W:      http://blackfin.uclinux.org/
+S:      Supported
+
 BLOCK LAYER
 P:      Jens Axboe
 M:      axboe@kernel.dk
@@ -892,12 +944,14 @@ CFAG12864B LCD DRIVER
 P:      Miguel Ojeda Sandonis
 M:      maxextreme@gmail.com
 L:      linux-kernel@vger.kernel.org
+W:      http://auxdisplay.googlepages.com/
 S:      Maintained
 
 CFAG12864BFB LCD FRAMEBUFFER DRIVER
 P:      Miguel Ojeda Sandonis
 M:      maxextreme@gmail.com
 L:      linux-kernel@vger.kernel.org
+W:      http://auxdisplay.googlepages.com/
 S:      Maintained
 
 CFG80211 and NL80211
@@ -984,6 +1038,14 @@ S:	Maintained
 CONEXANT ACCESSRUNNER USB DRIVER
 P:      Simon Arlott
 M:      cxacru@fire.lp0.eu
+L:      accessrunner-general@lists.sourceforge.net
+W:      http://accessrunner.sourceforge.net/
+S:      Maintained
+
+CORETEMP HARDWARE MONITORING DRIVER
+P:      Rudolf Marek
+M:      r.marek@assembler.cz
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
 COSA/SRP SYNC SERIAL DRIVER
@@ -1459,6 +1521,11 @@ L:	linux-scsi@vger.kernel.org
 W:      http://www.icp-vortex.com/
 S:      Supported
 
+GENERIC GPIO I2C DRIVER
+P:      Haavard Skinnemoen
+M:      hskinnemoen@atmel.com
+S:      Supported
+
 GENERIC HDLC DRIVER, N2, C101, PCI200SYN and WANXL DRIVERS
 P:      Krzysztof Halasa
 M:      khc@pm.waw.pl
@@ -1582,9 +1649,9 @@ S:	Supported
 
 HOST AP DRIVER
 P:      Jouni Malinen
-M:      jkmaline@cc.hut.fi
+M:      j@w1.fi
+L:      hostap@shmoo.com (subscribers-only)
 L:      linux-wireless@vger.kernel.org
-L:      hostap@shmoo.com
 W:      http://hostap.epitest.fi/
 S:      Maintained
 
@@ -1605,7 +1672,7 @@ S:	Maintained
 
 HPET:   x86_64
 P:      Andi Kleen and Vojtech Pavlik
-M:      ak@muc.de and vojtech@suse.cz
+M:      andi@firstfloor.org and vojtech@suse.cz
 S:      Maintained
 
 HPET:   ACPI hpet.c
@@ -1631,6 +1698,13 @@ L:	i2c@lm-sensors.org
 T:      quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
 S:      Maintained
 
+I2C-TINY-USB DRIVER
+P:      Till Harbaum
+M:      till@harbaum.org
+L:      i2c@lm-sensors.org
+T:      http://www.harbaum.org/till/i2c_tiny_usb
+S:      Maintained
+
 i386 BOOT CODE
 P:      Riley H. Williams
 M:      Riley@Williams.Name
@@ -1658,15 +1732,6 @@ W:	http://www.ia64-linux.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 S:      Maintained
 
-IBM ACPI EXTRAS DRIVER
-P:      Henrique de Moraes Holschuh
-M:      ibm-acpi@hmh.eng.br
-L:      ibm-acpi-devel@lists.sourceforge.net
-W:      http://ibm-acpi.sourceforge.net
-W:      http://thinkwiki.org/wiki/Ibm-acpi
-T:      git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
-S:      Maintained
-
 SN-IA64 (Itanium) SUB-PLATFORM
 P:      Jes Sorensen
 M:      jes@sgi.com
@@ -1820,6 +1885,7 @@ P:	Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1834,6 +1900,7 @@ P:	Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1848,6 +1915,7 @@ P:	Jesse Brandeburg
 M:      jesse.brandeburg@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1970,7 +2038,7 @@ P:	Vivek Goyal
 M:      vgoyal@in.ibm.com
 P:      Haren Myneni
 M:      hbabu@us.ibm.com
-L:      fastboot@lists.linux-foundation.org
+L:      kexec@lists.infradead.org
 L:      linux-kernel@vger.kernel.org
 W:      http://lse.sourceforge.net/kdump/
 S:      Maintained
@@ -2020,7 +2088,7 @@ P:	Eric Biederman
 M:      ebiederm@xmission.com
 W:      http://www.xmission.com/~ebiederm/files/kexec/
 L:      linux-kernel@vger.kernel.org
-L:      fastboot@lists.linux-foundation.org
+L:      kexec@lists.infradead.org
 S:      Maintained
 
 KPROBES
@@ -2039,6 +2107,7 @@ KS0108 LCD CONTROLLER DRIVER
 P:      Miguel Ojeda Sandonis
 M:      maxextreme@gmail.com
 L:      linux-kernel@vger.kernel.org
+W:      http://auxdisplay.googlepages.com/
 S:      Maintained
 
 LAPB module
@@ -2215,6 +2284,16 @@ M:	philb@gnu.org
 W:      http://www.tazenda.demon.co.uk/phil/linux-hp
 S:      Maintained
 
+MAC80211
+P:      Jiri Benc
+M:      jbenc@suse.cz
+P:      Michael Wu
+M:      flamingice@sourmilk.net
+L:      linux-wireless@vger.kernel.org
+W:      http://linuxwireless.org/
+T:      git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
+S:      Maintained
+
 MARVELL YUKON / SYSKONNECT DRIVER
 P:      Mirko Lindner
 M:      mlindner@syskonnect.de
@@ -2243,6 +2322,12 @@ M:	vandrove@vc.cvut.cz
 L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
+MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
+P:      Hans J. Koch
+M:      hjk@linutronix.de
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 MEGARAID SCSI DRIVERS
 P:      Neela Syam Kolli
 M:      Neela.Kolli@engenio.com
@@ -2509,6 +2594,19 @@ M:	adaplas@gmail.com
 L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
+NETERION (S2IO) Xframe 10GbE DRIVER
+P:      Ramkrishna Vepa
+M:      ram.vepa@neterion.com
+P:      Rastapur Santosh
+M:      santosh.rastapur@neterion.com
+P:      Sivakumar Subramani
+M:      sivakumar.subramani@neterion.com
+P:      Sreenivasa Honnur
+M:      sreenivasa.honnur@neterion.com
+L:      netdev@vger.kernel.org
+W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
+S:      Supported
+
 OPENCORES I2C BUS DRIVER
 P:      Peter Korsgaard
 M:      jacmet@sunsite.dk
@@ -2622,6 +2720,19 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
 T:      cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
 S:      Maintained
 
+PARAVIRT_OPS INTERFACE
+P:      Jeremy Fitzhardinge
+M:      jeremy@xensource.com
+P:      Chris Wright
+M:      chrisw@sous-sol.org
+P:      Zachary Amsden
+M:      zach@vmware.com
+P:      Rusty Russell
+M:      rusty@rustcorp.com.au
+L:      virtualization@lists.osdl.org
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+
 PC87360 HARDWARE MONITORING DRIVER
 P:      Jim Cromie
 M:      jim.cromie@gmail.com
@@ -2697,7 +2808,7 @@ L:	linux-abi-devel@lists.sourceforge.net
 S:      Maintained
 
 PHRAM MTD DRIVER
-P:      Jörn Engel
+P:      Jörn Engel
 M:      joern@wh.fh-wedel.de
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
@@ -2971,7 +3082,7 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 S:      Maintained
 
 SCSI TAPE DRIVER
-P:      Kai Mäkisara
+P:      Kai Mäkisara
 M:      Kai.Makisara@kolumbus.fi
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
@@ -3017,6 +3128,11 @@ L: 	selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:      http://www.nsa.gov/selinux
 S:      Supported
 
+SENSABLE PHANTOM
+P:      Jiri Slaby
+M:      jirislaby@gmail.com
+S:      Maintained
+
 SERIAL ATA (SATA) SUBSYSTEM:
 P:      Jeff Garzik
 M:      jgarzik@pobox.com
@@ -3172,6 +3288,15 @@ P:	Chris Zankel
 M:      chris@zankel.net
 S:      Maintained
 
+THINKPAD ACPI EXTRAS DRIVER
+P:      Henrique de Moraes Holschuh
+M:      ibm-acpi@hmh.eng.br
+L:      ibm-acpi-devel@lists.sourceforge.net
+W:      http://ibm-acpi.sourceforge.net
+W:      http://thinkwiki.org/wiki/Ibm-acpi
+T:      git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
+S:      Maintained
+
 UltraSPARC (sparc64):
 P:      David S. Miller
 M:      davem@davemloft.net
@@ -3617,8 +3742,8 @@ W:	http://www.kroah.com/linux/
 S:      Maintained
 
 USB SERIAL WHITEHEAT DRIVER
-P:      Stuart MacDonald
-M:      stuartm@connecttech.com
+P:      Support Department
+M:      support@connecttech.com
 L:      linux-usb-users@lists.sourceforge.net
 L:      linux-usb-devel@lists.sourceforge.net
 W:      http://www.connecttech.com
@@ -3837,6 +3962,15 @@ M:	eis@baty.hanse.de
 L:      linux-x25@vger.kernel.org
 S:      Maintained
 
+XEN HYPERVISOR INTERFACE
+P:      Jeremy Fitzhardinge
+M:      jeremy@xensource.com
+P:      Chris Wright
+M:      chrisw@sous-sol.org
+L:      virtualization@lists.osdl.org
+L:      xen-devel@lists.xensource.com
+S:      Supported
+
 XFS FILESYSTEM
 P:      Silicon Graphics Inc
 P:      Tim Shimmin, David Chatterton