Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined MAINTAINERS
index 75a9a5fc230acde24280a584bc7f8af994b677c7,0b92435d9f511052f8b3bca11af413a9f4deebf6..3612de541cb39c557f574b537cdd5ae0b9046ea8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -159,7 -159,7 +159,7 @@@ S: Maintaine
  F:    drivers/net/ethernet/realtek/r8169.c
  
  8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 -M:    Greg Kroah-Hartman <gregkh@suse.de>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-serial@vger.kernel.org
  W:    http://serial.sourceforge.net
  S:    Maintained
@@@ -269,6 -269,7 +269,6 @@@ S: Orpha
  F:    drivers/platform/x86/wmi.c
  
  AD1889 ALSA SOUND DRIVER
 -M:    Kyle McMartin <kyle@mcmartin.ca>
  M:    Thibaut Varene <T-Bone@parisc-linux.org>
  W:    http://wiki.parisc-linux.org/AD1889
  L:    linux-parisc@vger.kernel.org
@@@ -788,6 -789,12 +788,6 @@@ F:        arch/arm/mach-mx*
  F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
  
 -ARM/FREESCALE IMX51
 -M:    Amit Kucheria <amit.kucheria@canonical.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-mx5/
 -
  ARM/FREESCALE IMX6
  M:    Shawn Guo <shawn.guo@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1405,7 -1412,7 +1405,7 @@@ F:      net/ax25
  B43 WIRELESS DRIVER
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
- L:    b43-dev@lists.infradead.org (moderated for non-subscribers)
+ L:    b43-dev@lists.infradead.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
  S:    Maintained
  F:    drivers/net/wireless/b43/
@@@ -1414,6 -1421,7 +1414,7 @@@ B43LEGACY WIRELESS DRIVE
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
+ L:    b43-dev@lists.infradead.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
  S:    Maintained
  F:    drivers/net/wireless/b43legacy/
@@@ -1567,7 -1575,6 +1568,6 @@@ F:      drivers/net/ethernet/broadcom/tg3.
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Brett Rudley <brudley@broadcom.com>
- M:    Henry Ptasinski <henryp@broadcom.com>
  M:    Roland Vossen <rvossen@broadcom.com>
  M:    Arend van Spriel <arend@broadcom.com>
  M:    Franky (Zhenhui) Lin <frankyl@broadcom.com>
@@@ -1776,9 -1783,9 +1776,9 @@@ X:      net/wireless/wext
  
  CHAR and MISC DRIVERS
  M:    Arnd Bergmann <arnd@arndb.de>
 -M:    Greg Kroah-Hartman <greg@kroah.com>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 -S:    Maintained
 +S:    Supported
  F:    drivers/char/*
  F:    drivers/misc/*
  
@@@ -2280,7 -2287,7 +2280,7 @@@ F:      drivers/acpi/dock.
  DOCUMENTATION
  M:    Randy Dunlap <rdunlap@xenotime.net>
  L:    linux-doc@vger.kernel.org
 -T:    quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
 +T:    quilt http://xenotime.net/kernel-doc-patches/current/
  S:    Maintained
  F:    Documentation/
  
@@@ -2313,7 -2320,7 +2313,7 @@@ F:      lib/lru_cache.
  F:    Documentation/blockdev/drbd/
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
 -M:    Greg Kroah-Hartman <gregkh@suse.de>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
  S:    Supported
  F:    Documentation/kobject.txt
@@@ -2343,9 -2350,6 +2343,9 @@@ F:      include/drm/i915
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <inki.dae@samsung.com>
 +M:    Joonyoung Shim <jy0922.shim@samsung.com>
 +M:    Seung-Woo Kim <sw0312.kim@samsung.com>
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/exynos
@@@ -2398,7 -2402,7 +2398,7 @@@ F:      net/bridge/netfilter/ebt*.
  
  ECRYPT FILE SYSTEM
  M:    Tyler Hicks <tyhicks@canonical.com>
 -M:    Dustin Kirkland <kirkland@canonical.com>
 +M:    Dustin Kirkland <dustin.kirkland@gazzang.com>
  L:    ecryptfs@vger.kernel.org
  W:    https://launchpad.net/ecryptfs
  S:    Supported
@@@ -3046,6 -3050,7 +3046,6 @@@ F:      drivers/hwspinlock/hwspinlock_
  F:    include/linux/hwspinlock.h
  
  HARMONY SOUND DRIVER
 -M:    Kyle McMartin <kyle@mcmartin.ca>
  L:    linux-parisc@vger.kernel.org
  S:    Maintained
  F:    sound/parisc/harmony.*
@@@ -3316,12 -3321,6 +3316,12 @@@ S:    Maintaine
  F:    net/ieee802154/
  F:    drivers/ieee802154/
  
 +IIO SUBSYSTEM AND DRIVERS
 +M:    Jonathan Cameron <jic23@cam.ac.uk>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/iio/
 +
  IKANOS/ADI EAGLE ADSL USB DRIVER
  M:    Matthieu Castet <castet.matthieu@free.fr>
  M:    Stanislaw Gruszka <stf_xl@wp.pl>
@@@ -3990,11 -3989,11 +3990,11 @@@ M:   Rusty Russell <rusty@rustcorp.com.au
  L:    lguest@lists.ozlabs.org
  W:    http://lguest.ozlabs.org/
  S:    Odd Fixes
 -F:    Documentation/virtual/lguest/
 +F:    arch/x86/include/asm/lguest*.h
  F:    arch/x86/lguest/
  F:    drivers/lguest/
  F:    include/linux/lguest*.h
 -F:    arch/x86/include/asm/lguest*.h
 +F:    tools/lguest/
  
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <paulus@au.ibm.com>
@@@ -4134,11 -4133,10 +4134,11 @@@ L:   linux-ntfs-dev@lists.sourceforge.ne
  W:    http://www.linux-ntfs.org/content/view/19/37/
  S:    Maintained
  F:    Documentation/ldm.txt
 -F:    fs/partitions/ldm.*
 +F:    block/partitions/ldm.*
  
  LogFS
  M:    Joern Engel <joern@logfs.org>
 +M:    Prasad Joshi <prasadjoshi.linux@gmail.com>
  L:    logfs@logfs.org
  W:    logfs.org
  S:    Maintained
@@@ -4280,6 -4278,13 +4280,6 @@@ S:     Orpha
  F:    drivers/video/matrox/matroxfb_*
  F:    include/linux/matroxfb.h
  
 -MAX1668 TEMPERATURE SENSOR DRIVER
 -M:    "David George" <david.george@ska.ac.za>
 -L:    lm-sensors@lm-sensors.org
 -S:    Maintained
 -F:    Documentation/hwmon/max1668
 -F:    drivers/hwmon/max1668.c
 -
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    "Hans J. Koch" <hjk@hansjkoch.de>
  L:    lm-sensors@lm-sensors.org
@@@ -4910,8 -4915,6 +4910,6 @@@ F:      fs/ocfs2
  
  ORINOCO DRIVER
  L:    linux-wireless@vger.kernel.org
- L:    orinoco-users@lists.sourceforge.net
- L:    orinoco-devel@lists.sourceforge.net
  W:    http://linuxwireless.org/en/users/Drivers/orinoco
  W:    http://www.nongnu.org/orinoco/
  S:    Orphan
@@@ -4998,8 -5001,9 +4996,8 @@@ F:      Documentation/blockdev/paride.tx
  F:    drivers/block/paride/
  
  PARISC ARCHITECTURE
 -M:    Kyle McMartin <kyle@mcmartin.ca>
 -M:    Helge Deller <deller@gmx.de>
  M:    "James E.J. Bottomley" <jejb@parisc-linux.org>
 +M:    Helge Deller <deller@gmx.de>
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
@@@ -5630,7 -5634,7 +5628,7 @@@ W:      http://www.ibm.com/developerworks/li
  S:    Supported
  F:    arch/s390/
  F:    drivers/s390/
 -F:    fs/partitions/ibm.c
 +F:    block/partitions/ibm.c
  F:    Documentation/s390/
  F:    Documentation/DocBook/s390*
  
@@@ -5858,7 -5862,7 +5856,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/sdhci-spear.c
  
  SECURITY SUBSYSTEM
 -M:    James Morris <jmorris@namei.org>
 +M:    James Morris <james.l.morris@oracle.com>
  L:    linux-security-module@vger.kernel.org (suggested Cc:)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
  W:    http://security.wiki.kernel.org/
@@@ -5871,7 -5875,7 +5869,7 @@@ S:      Supporte
  
  SELINUX SECURITY MODULE
  M:    Stephen Smalley <sds@tycho.nsa.gov>
 -M:    James Morris <jmorris@namei.org>
 +M:    James Morris <james.l.morris@oracle.com>
  M:    Eric Paris <eparis@parisplace.org>
  L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
  W:    http://selinuxproject.org
@@@ -6273,15 -6277,15 +6271,15 @@@ S:   Maintaine
  F:    arch/alpha/kernel/srm_env.c
  
  STABLE BRANCH
 -M:    Greg Kroah-Hartman <greg@kroah.com>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    stable@vger.kernel.org
 -S:    Maintained
 +S:    Supported
  
  STAGING SUBSYSTEM
 -M:    Greg Kroah-Hartman <gregkh@suse.de>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  L:    devel@driverdev.osuosl.org
 -S:    Maintained
 +S:    Supported
  F:    drivers/staging/
  
  STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
@@@ -6393,6 -6397,11 +6391,6 @@@ M:     Omar Ramirez Luna <omar.ramirez@ti.c
  S:    Odd Fixes
  F:    drivers/staging/tidspbridge/
  
 -STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
 -L:    linux-media@vger.kernel.org
 -S:    Odd Fixes
 -F:    drivers/staging/tm6000/
 -
  STAGING - USB ENE SM/MS CARD READER DRIVER
  M:    Al Cho <acho@novell.com>
  S:    Odd Fixes
@@@ -6661,10 -6670,10 +6659,10 @@@ S:   Maintaine
  K:    ^Subject:.*(?i)trivial
  
  TTY LAYER
 -M:    Greg Kroah-Hartman <gregkh@suse.de>
 -S:    Maintained
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 -F:    drivers/tty/*
 +F:    drivers/tty/
  F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
  F:    include/linux/serial.h
@@@ -6950,7 -6959,7 +6948,7 @@@ S:      Maintaine
  F:    drivers/usb/serial/digi_acceleport.c
  
  USB SERIAL DRIVER
 -M:    Greg Kroah-Hartman <gregkh@suse.de>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-usb@vger.kernel.org
  S:    Supported
  F:    Documentation/usb/usb-serial.txt
@@@ -6965,8 -6974,9 +6963,8 @@@ S:      Maintaine
  F:    drivers/usb/serial/empeg.c
  
  USB SERIAL KEYSPAN DRIVER
 -M:    Greg Kroah-Hartman <greg@kroah.com>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-usb@vger.kernel.org
 -W:    http://www.kroah.com/linux/
  S:    Maintained
  F:    drivers/usb/serial/*keyspan*
  
@@@ -6994,7 -7004,7 +6992,7 @@@ F:      Documentation/video4linux/sn9c102.tx
  F:    drivers/media/video/sn9c102/
  
  USB SUBSYSTEM
 -M:    Greg Kroah-Hartman <gregkh@suse.de>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
@@@ -7081,7 -7091,7 +7079,7 @@@ F:      fs/hppfs
  
  USERSPACE I/O (UIO)
  M:    "Hans J. Koch" <hjk@hansjkoch.de>
 -M:    Greg Kroah-Hartman <gregkh@suse.de>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Maintained
  F:    Documentation/DocBook/uio-howto.tmpl
  F:    drivers/uio/
@@@ -7356,7 -7366,6 +7354,7 @@@ S:      Supporte
  F:    Documentation/hwmon/wm83??
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/leds/leds-wm83*.c
 +F:    drivers/hwmon/wm83??-hwmon.c
  F:    drivers/input/misc/wm831x-on.c
  F:    drivers/input/touchscreen/wm831x-ts.c
  F:    drivers/input/touchscreen/wm97*.c