1 files changed, 199 insertions, 34 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 510997499b59..78162c4f9544 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -166,9 +166,8 @@ F:	drivers/serial/8250*
 F:      include/linux/serial_8250.h
 
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
-M:      Paul Gortmaker <p_gortmaker@yahoo.com>
 L:      netdev@vger.kernel.org
-S:      Maintained
+S:      Orphan / Obsolete
 F:      drivers/net/*8390*
 F:      drivers/net/ax88796.c
 
@@ -286,6 +285,41 @@ L:	linux-parisc@vger.kernel.org
 S:      Maintained
 F:      sound/pci/ad1889.*
 
+AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/AD5254
+S:      Supported
+F:      drivers/misc/ad525x_dpot.c
+
+AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/AD5398
+S:      Supported
+F:      drivers/regulator/ad5398.c
+
+AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/AD7142
+S:      Supported
+F:      drivers/input/misc/ad714x.c
+
+AD7877 TOUCHSCREEN DRIVER
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/AD7877
+S:      Supported
+F:      drivers/input/touchscreen/ad7877.c
+
+AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/AD7879
+S:      Supported
+F:      drivers/input/touchscreen/ad7879.c
+
 ADM1025 HARDWARE MONITOR DRIVER
 M:      Jean Delvare <khali@linux-fr.org>
 L:      lm-sensors@lm-sensors.org
@@ -305,6 +339,32 @@ W:	http://linuxwireless.org/
 S:      Orphan
 F:      drivers/net/wireless/adm8211.*
 
+ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/ADP5520
+S:      Supported
+F:      drivers/mfd/adp5520.c
+F:      drivers/video/backlight/adp5520_bl.c
+F:      drivers/led/leds-adp5520.c
+F:      drivers/gpio/adp5520-gpio.c
+F:      drivers/input/keyboard/adp5520-keys.c
+
+ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/ADP5588
+S:      Supported
+F:      drivers/input/keyboard/adp5588-keys.c
+F:      drivers/gpio/adp5588-gpio.c
+
+ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/ADP8860
+S:      Supported
+F:      drivers/video/backlight/adp8860_bl.c
+
 ADT746X FAN DRIVER
 M:      Colin Leroy <colin@colino.net>
 S:      Maintained
@@ -317,6 +377,13 @@ S:	Maintained
 F:      Documentation/hwmon/adt7475
 F:      drivers/hwmon/adt7475.c
 
+ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
+M:      Michael Hennerich <michael.hennerich@analog.com>
+L:      device-driver-devel@blackfin.uclinux.org
+W:      http://wiki-analog.com/ADXL345
+S:      Supported
+F:      drivers/input/misc/adxl34x.c
+
 ADVANSYS SCSI DRIVER
 M:      Matthew Wilcox <matthew@wil.cx>
 L:      linux-scsi@vger.kernel.org
@@ -405,7 +472,7 @@ S:	Supported
 F:      drivers/usb/gadget/amd5536udc.*
 
 AMD GEODE PROCESSOR/CHIPSET SUPPORT
-P:      Jordan Crouse
+P:      Andres Salomon <dilinger@queued.net>
 L:      linux-geode@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
@@ -429,7 +496,6 @@ S:	Supported
 F:      arch/x86/kernel/microcode_amd.c
 
 AMS (Apple Motion Sensor) DRIVER
-M:      Stelian Pop <stelian@popies.net>
 M:      Michael Hanselmann <linux-kernel@hansmi.ch>
 S:      Supported
 F:      drivers/macintosh/ams/
@@ -441,17 +507,23 @@ L:	linux-rdma@vger.kernel.org
 S:      Maintained
 F:      drivers/infiniband/hw/amso1100/
 
-ANALOG DEVICES INC ASOC DRIVERS
-L:      uclinux-dist-devel@blackfin.uclinux.org
+ANALOG DEVICES INC ASOC CODEC DRIVERS
+L:      device-driver-devel@blackfin.uclinux.org
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
-W:      http://blackfin.uclinux.org/
+W:      http://wiki-analog.com/
 S:      Supported
-F:      sound/soc/blackfin/*
 F:      sound/soc/codecs/ad1*
 F:      sound/soc/codecs/adau*
 F:      sound/soc/codecs/adav*
 F:      sound/soc/codecs/ssm*
 
+ANALOG DEVICES INC ASOC DRIVERS
+L:      uclinux-dist-devel@blackfin.uclinux.org
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+W:      http://blackfin.uclinux.org/
+S:      Supported
+F:      sound/soc/blackfin/*
+
 AOA (Apple Onboard Audio) ALSA DRIVER
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linuxppc-dev@lists.ozlabs.org
@@ -792,11 +864,14 @@ S:	Maintained
 
 ARM/NOMADIK ARCHITECTURE
 M:      Alessandro Rubini <rubini@unipv.it>
+M:      Linus Walleij <linus.walleij@stericsson.com>
 M:      STEricsson <STEricsson_nomadik_linux@list.st.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-nomadik/
 F:      arch/arm/plat-nomadik/
+F:      drivers/i2c/busses/i2c-nomadik.c
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
 ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 M:      Nelson Castillo <arhuaco@freaks-unidos.net>
@@ -998,12 +1073,24 @@ F:	drivers/i2c/busses/i2c-stu300.c
 F:      drivers/rtc/rtc-coh901331.c
 F:      drivers/watchdog/coh901327_wdt.c
 F:      drivers/dma/coh901318*
+F:      drivers/mfd/ab3100*
+F:      drivers/rtc/rtc-ab3100.c
+F:      drivers/rtc/rtc-coh901331.c
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
-ARM/U8500 ARM ARCHITECTURE
+ARM/Ux500 ARM ARCHITECTURE
 M:      Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
+M:      Linus Walleij <linus.walleij@stericsson.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-ux500/
+F:      drivers/dma/ste_dma40*
+F:      drivers/mfd/ab3550*
+F:      drivers/mfd/abx500*
+F:      drivers/mfd/ab8500*
+F:      drivers/mfd/stmpe*
+F:      drivers/rtc/rtc-ab8500.c
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
 ARM/VFP SUPPORT
 M:      Russell King <linux@arm.linux.org.uk>
@@ -1080,6 +1167,12 @@ S:	Supported
 F:      Documentation/aoe/
 F:      drivers/block/aoe/
 
+ATHEROS ATH GENERIC UTILITIES
+M:      "Luis R. Rodriguez" <lrodriguez@atheros.com>
+L:      linux-wireless@vger.kernel.org
+S:      Supported
+F:      drivers/net/wireless/ath/*
+
 ATHEROS ATH5K WIRELESS DRIVER
 M:      Jiri Slaby <jirislaby@gmail.com>
 M:      Nick Kossifidis <mickflemm@gmail.com>
@@ -1258,6 +1351,15 @@ S:	Maintained
 F:      drivers/video/backlight/
 F:      include/linux/backlight.h
 
+BATMAN ADVANCED
+M:      Marek Lindner <lindner_marek@yahoo.de>
+M:      Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
+M:      Sven Eckelmann <sven@narfation.org>
+L:      b.a.t.m.a.n@lists.open-mesh.org
+W:      http://www.open-mesh.org/
+S:      Maintained
+F:      net/batman-adv/
+
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
 M:      Thomas Sailer <t.sailer@alumni.ethz.ch>
 L:      linux-hams@vger.kernel.org
@@ -1394,7 +1496,9 @@ F:	drivers/net/tg3.*
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:      Brett Rudley <brudley@broadcom.com>
 M:      Henry Ptasinski <henryp@broadcom.com>
-M:      Nohee Ko <noheek@broadcom.com>
+M:      Dowan Kim <dowan@broadcom.com>
+M:      Roland Vossen <rvossen@broadcom.com>
+M:      Arend van Spriel <arend@broadcom.com>
 L:      linux-wireless@vger.kernel.org
 S:      Supported
 F:      drivers/staging/brcm80211/
@@ -1680,7 +1784,8 @@ S:	Maintained
 F:      drivers/usb/atm/cxacru.c
 
 CONFIGFS
-M:      Joel Becker <joel.becker@oracle.com>
+M:      Joel Becker <jlbec@evilplan.org>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git
 S:      Supported
 F:      fs/configfs/
 F:      include/linux/configfs.h
@@ -2242,6 +2347,14 @@ W:	http://acpi4asus.sf.net
 S:      Maintained
 F:      drivers/platform/x86/eeepc-laptop.c
 
+EEEPC WMI EXTRAS DRIVER
+M:      Corentin Chary <corentincj@iksaif.net>
+L:      acpi4asus-user@lists.sourceforge.net
+L:      platform-driver-x86@vger.kernel.org
+W:      http://acpi4asus.sf.net
+S:      Maintained
+F:      drivers/platform/x86/eeepc-wmi.c
+
 EFIFB FRAMEBUFFER DRIVER
 L:      linux-fbdev@vger.kernel.org
 M:      Peter Jones <pjones@redhat.com>
@@ -2579,6 +2692,14 @@ S:	Supported
 F:      drivers/i2c/busses/i2c-gpio.c
 F:      include/linux/i2c-gpio.h
 
+GENERIC GPIO I2C MULTIPLEXER DRIVER
+M:      Peter Korsgaard <peter.korsgaard@barco.com>
+L:      linux-i2c@vger.kernel.org
+S:      Supported
+F:      drivers/i2c/muxes/gpio-i2cmux.c
+F:      include/linux/gpio-i2cmux.h
+F:      Documentation/i2c/muxes/gpio-i2cmux
+
 GENERIC HDLC (WAN) DRIVERS
 M:      Krzysztof Halasa <khc@pm.waw.pl>
 W:      http://www.kernel.org/pub/linux/utils/net/hdlc/
@@ -2797,6 +2918,10 @@ M:	Thomas Gleixner <tglx@linutronix.de>
 S:      Maintained
 F:      Documentation/timers/
 F:      kernel/hrtimer.c
+F:      kernel/time/clockevents.c
+F:      kernel/time/tick*.*
+F:      kernel/time/timer_*.c
+F       include/linux/clockevents.h
 F:      include/linux/hrtimer.h
 
 HIGH-SPEED SCC DRIVER FOR AX.25
@@ -3032,8 +3157,10 @@ F:	drivers/input/
 INPUT MULTITOUCH (MT) PROTOCOL
 M:      Henrik Rydberg <rydberg@euromail.se>
 L:      linux-input@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
 S:      Maintained
 F:      Documentation/input/multi-touch-protocol.txt
+F:      drivers/input/input-mt.c
 K:      \b(ABS|SYN)_MT_
 
 INTEL IDLE DRIVER
@@ -3120,6 +3247,8 @@ M:	Alex Duyck <alexander.h.duyck@intel.com>
 M:      John Ronciak <john.ronciak@intel.com>
 L:      e1000-devel@lists.sourceforge.net
 W:      http://e1000.sourceforge.net/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git
 S:      Supported
 F:      Documentation/networking/e100.txt
 F:      Documentation/networking/e1000.txt
@@ -3963,9 +4092,8 @@ F:	include/linux/module.h
 F:      kernel/module.c
 
 MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
-M:      Stelian Pop <stelian@popies.net>
 W:      http://popies.net/meye/
-S:      Maintained
+S:      Orphan
 F:      Documentation/video4linux/meye.txt
 F:      drivers/media/video/meye.*
 F:      include/linux/meye.h
@@ -4231,6 +4359,7 @@ NILFS2 FILESYSTEM
 M:      KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
 L:      linux-nilfs@vger.kernel.org
 W:      http://www.nilfs.org/en/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git
 S:      Supported
 F:      Documentation/filesystems/nilfs2.txt
 F:      fs/nilfs2/
@@ -4252,11 +4381,11 @@ F:	Documentation/scsi/NinjaSCSI.txt
 F:      drivers/scsi/nsp32*
 
 NTFS FILESYSTEM
-M:      Anton Altaparmakov <aia21@cantab.net>
+M:      Anton Altaparmakov <anton@tuxera.com>
 L:      linux-ntfs-dev@lists.sourceforge.net
-W:      http://www.linux-ntfs.org/
+W:      http://www.tuxera.com/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
-S:      Maintained
+S:      Supported
 F:      Documentation/filesystems/ntfs.txt
 F:      fs/ntfs/
 
@@ -4328,6 +4457,20 @@ M:	Deepak Saxena <dsaxena@plexity.net>
 S:      Maintained
 F:      drivers/char/hw_random/omap-rng.c
 
+OMAP HWMOD SUPPORT
+M:      Benoît Cousson <b-cousson@ti.com>
+M:      Paul Walmsley <paul@pwsan.com>
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      arch/arm/mach-omap2/omap_hwmod.c
+F:      arch/arm/plat-omap/include/plat/omap_hwmod.h
+
+OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
+M:      Benoît Cousson <b-cousson@ti.com>
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+
 OMAP USB SUPPORT
 M:      Felipe Balbi <balbi@ti.com>
 M:      David Brownell <dbrownell@users.sourceforge.net>
@@ -4405,7 +4548,7 @@ F:	include/linux/oprofile.h
 
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 M:      Mark Fasheh <mfasheh@suse.com>
-M:      Joel Becker <joel.becker@oracle.com>
+M:      Joel Becker <jlbec@evilplan.org>
 L:      ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:      http://oss.oracle.com/projects/ocfs2/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
@@ -4590,7 +4733,7 @@ F:	drivers/pcmcia/
 F:      include/pcmcia/
 
 PCNET32 NETWORK DRIVER
-M:      Don Fry <pcnet32@verizon.net>
+M:      Don Fry <pcnet32@frontier.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/pcnet32.c
@@ -4602,6 +4745,16 @@ S:	Maintained
 F:      crypto/pcrypt.c
 F:      include/crypto/pcrypt.h
 
+PER-CPU MEMORY ALLOCATOR
+M:      Tejun Heo <tj@kernel.org>
+M:      Christoph Lameter <cl@linux-foundation.org>
+L:      linux-kernel@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
+S:      Maintained
+F:      include/linux/percpu*.h
+F:      mm/percpu*.c
+F:      arch/*/include/asm/percpu.h
+
 PER-TASK DELAY ACCOUNTING
 M:      Balbir Singh <balbir@linux.vnet.ibm.com>
 S:      Maintained
@@ -4612,7 +4765,7 @@ PERFORMANCE EVENTS SUBSYSTEM
 M:      Peter Zijlstra <a.p.zijlstra@chello.nl>
 M:      Paul Mackerras <paulus@samba.org>
 M:      Ingo Molnar <mingo@elte.hu>
-M:      Arnaldo Carvalho de Melo <acme@redhat.com>
+M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:      Supported
 F:      kernel/perf_event*.c
 F:      include/linux/perf_event.h
@@ -4978,11 +5131,6 @@ F:	kernel/rcu*
 F:      kernel/srcu*
 X:      kernel/rcutorture.c
 
-REAL TIME CLOCK DRIVER (LEGACY)
-M:      Paul Gortmaker <p_gortmaker@yahoo.com>
-S:      Maintained
-F:      drivers/char/rtc.c
-
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:      Alessandro Zummo <a.zummo@towertech.it>
 L:      rtc-linux@googlegroups.com
@@ -5037,7 +5185,7 @@ L:	linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
-F:      drivers/net/wireless/rtl818x/rtl8180*
+F:      drivers/net/wireless/rtl818x/rtl8180/
 
 RTL8187 WIRELESS DRIVER
 M:      Herton Ronaldo Krzesinski <herton@mandriva.com.br>
@@ -5047,7 +5195,17 @@ L:	linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
-F:      drivers/net/wireless/rtl818x/rtl8187*
+F:      drivers/net/wireless/rtl818x/rtl8187/
+
+RTL8192CE WIRELESS DRIVER
+M:      Larry Finger <Larry.Finger@lwfinger.net>
+M:      Chaoming Li <chaoming_li@realsil.com.cn>
+L:      linux-wireless@vger.kernel.org
+W:      http://linuxwireless.org/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
+S:      Maintained
+F:      drivers/net/wireless/rtlwifi/
+F:      drivers/net/wireless/rtlwifi/rtl8192ce/
 
 S3 SAVAGE FRAMEBUFFER DRIVER
 M:      Antonino Daplas <adaplas@gmail.com>
@@ -5127,6 +5285,18 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
 F:      sound/soc/s3c24xx
 
+TIMEKEEPING, NTP
+M:      John Stultz <johnstul@us.ibm.com>
+M:      Thomas Gleixner <tglx@linutronix.de>
+S:      Supported
+F:      include/linux/clocksource.h
+F:      include/linux/time.h
+F:      include/linux/timex.h
+F:      include/linux/timekeeping.h
+F:      kernel/time/clocksource.c
+F:      kernel/time/time*.c
+F:      kernel/time/ntp.c
+
 TLG2300 VIDEO4LINUX-2 DRIVER
 M:      Huang Shijie <shijie8@gmail.com>
 M:      Kang Yong <kangyong@telegent.com>
@@ -5697,12 +5867,6 @@ M:	Ion Badulescu <ionut@badula.org>
 S:      Odd Fixes
 F:      drivers/net/starfire*
 
-STRADIS MPEG-2 DECODER DRIVER
-M:      Nathan Laredo <laredo@gnu.org>
-W:      http://www.stradis.com/
-S:      Maintained
-F:      drivers/media/video/stradis.c
-
 SUN3/3X
 M:      Sam Creasey <sammy@sammy.net>
 W:      http://sammy.net/sun3/
@@ -5852,7 +6016,8 @@ F:	drivers/net/tlan.*
 TOMOYO SECURITY MODULE
 M:      Kentaro Takeda <takedakn@nttdata.co.jp>
 M:      Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-L:      tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for developers and users in English)
+L:      tomoyo-dev-en@lists.sourceforge.jp (subscribers-only, for developers in English)
+L:      tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for users in English)
 L:      tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
 L:      tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
 W:      http://tomoyo.sourceforge.jp/
@@ -6415,7 +6580,7 @@ F:	net/8021q/
 
 VLYNQ BUS
 M:      Florian Fainelli <florian@openwrt.org>
-L:      openwrt-devel@lists.openwrt.org
+L:      openwrt-devel@lists.openwrt.org (subscribers-only)
 S:      Maintained
 F:      drivers/vlynq/vlynq.c
 F:      include/linux/vlynq.h