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

diff --combined MAINTAINERS
index 6bd1cd5c60df74404ae32e9f623606195dcd120a,cb0a8003b5b9f191d2416e2f782f54a70eed933d..e71ff7c67a633228468006a6c6be4a7faabd8486
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -327,13 -327,6 +327,13 @@@ M:       Colin Leroy <[email protected]
  S:    Maintained
  F:    drivers/macintosh/therm_adt746x.c
  
 +ADT7475 HARDWARE MONITOR DRIVER
 +M:    Jean Delvare <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/adt7475
 +F:    drivers/hwmon/adt7475.c
 +
  ADVANSYS SCSI DRIVER
  M:    Matthew Wilcox <[email protected]>
  L:    [email protected]
@@@ -410,8 -403,9 +410,8 @@@ F: drivers/i2c/busses/i2c-ali1563.
  
  ALPHA PORT
  M:    Richard Henderson <[email protected]>
 -S:    Odd Fixes for 2.4; Maintained for 2.6.
  M:    Ivan Kokshaysky <[email protected]>
 -S:    Maintained for 2.4; PCI support for 2.6.
 +M:    Matt Turner <[email protected]>
  L:    [email protected]
  F:    arch/alpha/
  
@@@ -492,6 -486,13 +492,6 @@@ S:        Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 -APPLETOUCH TOUCHPAD DRIVER
 -M:    Johannes Berg <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/input/appletouch.txt
 -F:    drivers/input/mouse/appletouch.c
 -
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <[email protected]>
  S:    Maintained
@@@ -800,19 -801,6 +800,19 @@@ L:       [email protected] (
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
  S:    Supported
  
 +ARM/QUALCOMM MSM MACHINE SUPPORT
 +M:    David Brown <[email protected]>
 +M:    Daniel Walker <[email protected]>
 +M:    Bryan Huntsman <[email protected]>
 +F:    arch/arm/mach-msm/
 +F:    drivers/video/msm/
 +F:    drivers/mmc/host/msm_sdcc.c
 +F:    drivers/mmc/host/msm_sdcc.h
 +F:    drivers/serial/msm_serial.h
 +F:    drivers/serial/msm_serial.c
 +T:    git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git
 +S:    Maintained
 +
  ARM/TOSA MACHINE SUPPORT
  M:    Dmitry Eremin-Solenikov <[email protected]>
  M:    Dirk Opfer <[email protected]>
@@@ -834,13 -822,13 +834,13 @@@ F:      arch/arm/mach-pxa/palmte2.
  F:    arch/arm/mach-pxa/include/mach/palmtc.h
  F:    arch/arm/mach-pxa/palmtc.c
  
 -ARM/PALM TREO 680 SUPPORT
 +ARM/PALM TREO SUPPORT
  M:    Tomas Cech <[email protected]>
  L:    [email protected]
  W:    http://hackndev.com
  S:    Maintained
 -F:    arch/arm/mach-pxa/include/mach/treo680.h
 -F:    arch/arm/mach-pxa/treo680.c
 +F:    arch/arm/mach-pxa/include/mach/palmtreo.h
 +F:    arch/arm/mach-pxa/palmtreo.c
  
  ARM/PALMZ72 SUPPORT
  M:    Sergey Lapin <[email protected]>
@@@ -987,6 -975,7 +987,6 @@@ F: drivers/platform/x86/asus-laptop.
  
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  M:    Dan Williams <[email protected]>
 -M:    Maciej Sosnowski <[email protected]>
  W:    http://sourceforge.net/projects/xscaleiop
  S:    Supported
  F:    Documentation/crypto/async-tx-api.txt
@@@ -1400,8 -1389,6 +1400,8 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/usb/WUSB-Design-overview.txt
  F:    Documentation/usb/wusb-cbaf
 +F:    drivers/usb/host/hwa-hc.c
 +F:    drivers/usb/host/whci/
  F:    drivers/usb/wusbcore/
  F:    include/linux/usb/wusb*
  
@@@ -1470,12 -1457,6 +1470,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/scsi/fnic/
  
 +CMPC ACPI DRIVER
 +M:    Thadeu Lima de Souza Cascardo <[email protected]>
 +M:    Daniel Oliveira Nascimento <[email protected]>
 +S:    Supported
 +F:    drivers/platform/x86/classmate-laptop.c
 +
  CODA FILE SYSTEM
  M:    Jan Harkes <[email protected]>
  M:    [email protected]
@@@ -1488,8 -1469,8 +1488,8 @@@ F:      include/linux/coda*.
  
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
  S:    Supported
@@@ -1636,8 -1617,9 +1636,8 @@@ S:      Maintaine
  F:    sound/pci/cs5535audio/
  
  CX18 VIDEO4LINUX DRIVER
 -M:    Hans Verkuil <[email protected]>
  M:    Andy Walls <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://linuxtv.org
@@@ -1733,9 -1715,10 +1733,9 @@@ F:     include/linux/tfrc.
  F:    net/dccp/
  
  DECnet NETWORK LAYER
 -M:    Christine Caulfield <[email protected]>
  W:    http://linux-decnet.sourceforge.net
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/networking/decnet.txt
  F:    net/decnet/
  
@@@ -1821,6 -1804,7 +1821,6 @@@ S:      Supporte
  F:    fs/dlm/
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 -M:    Maciej Sosnowski <[email protected]>
  M:    Dan Williams <[email protected]>
  S:    Supported
  F:    drivers/dma/
@@@ -2164,9 -2148,10 +2164,9 @@@ F:     drivers/hwmon/f75375s.
  F:    include/linux/f75375s.h
  
  FIREWIRE SUBSYSTEM
 -M:    Kristian Hoegsberg <[email protected]>
  M:    Stefan Richter <[email protected]>
  L:    [email protected]
 -W:    http://www.linux1394.org/
 +W:    http://ieee1394.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
  S:    Maintained
  F:    drivers/firewire/
@@@ -2372,12 -2357,6 +2372,12 @@@ F:    Documentation/isdn/README.gigase
  F:    drivers/isdn/gigaset/
  F:    include/linux/gigaset_dev.h
  
 +GRETH 10/100/1G Ethernet MAC device driver
 +M:    Kristoffer Glembo <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/greth*
 +
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <[email protected]>
  L:    [email protected]
@@@ -2385,15 -2364,6 +2385,15 @@@ W:    http://www.kernel.org/pub/linux/kern
  S:    Maintained
  F:    drivers/hwmon/hdaps.c
  
 +HWPOISON MEMORY FAILURE HANDLING
 +M:    Andi Kleen <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
 +S:    Maintained
 +F:    mm/memory-failure.c
 +F:    mm/hwpoison-inject.c
 +
  HYPERVISOR VIRTUAL CONSOLE DRIVER
  L:    [email protected]
  S:    Odd Fixes
@@@ -2453,9 -2423,7 +2453,9 @@@ HARDWARE MONITORIN
  L:    [email protected]
  W:    http://www.lm-sensors.org/
  S:    Orphan
 +F:    Documentation/hwmon/
  F:    drivers/hwmon/
 +F:    include/linux/hwmon*.h
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
  M:    Matt Mackall <[email protected]>
@@@ -2705,14 -2673,22 +2705,14 @@@ S:   Supporte
  F:    drivers/idle/i7300_idle.c
  
  IEEE 1394 SUBSYSTEM
 -M:    Ben Collins <[email protected]>
  M:    Stefan Richter <[email protected]>
  L:    [email protected]
 -W:    http://www.linux1394.org/
 +W:    http://ieee1394.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 -S:    Maintained
 +S:    Obsolete
  F:    Documentation/debugging-via-ohci1394.txt
  F:    drivers/ieee1394/
  
 -IEEE 1394 RAW I/O DRIVER
 -M:    Dan Dennedy <[email protected]>
 -M:    Stefan Richter <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/ieee1394/raw1394*
 -
  IEEE 802.15.4 SUBSYSTEM
  M:    Dmitry Eremin-Solenikov <[email protected]>
  M:    Sergey Lapin <[email protected]>
@@@ -2789,7 -2765,7 +2789,7 @@@ F:      arch/x86/kernel/microcode_core.
  F:    arch/x86/kernel/microcode_intel.c
  
  INTEL I/OAT DMA DRIVER
 -M:    Maciej Sosnowski <maciej.sosnowski@intel.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
  S:    Supported
  F:    drivers/dma/ioat*
  
@@@ -2827,11 -2803,10 +2827,11 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/net/ixp2000/
  
 -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
 +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe)
  M:    Jeff Kirsher <[email protected]>
  M:    Jesse Brandeburg <[email protected]>
  M:    Bruce Allan <[email protected]>
 +M:    Alex Duyck <[email protected]>
  M:    PJ Waskiewicz <[email protected]>
  M:    John Ronciak <[email protected]>
  L:    [email protected]
@@@ -2841,7 -2816,6 +2841,7 @@@ F:      drivers/net/e100.
  F:    drivers/net/e1000/
  F:    drivers/net/e1000e/
  F:    drivers/net/igb/
 +F:    drivers/net/igbvf/
  F:    drivers/net/ixgb/
  F:    drivers/net/ixgbe/
  
@@@ -3015,8 -2989,8 +3015,8 @@@ S:      Maintaine
  F:    drivers/isdn/hardware/eicon/
  
  IVTV VIDEO4LINUX DRIVER
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 +M:    Andy Walls <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  W:    http://www.ivtvdriver.org
@@@ -3092,11 -3066,8 +3092,11 @@@ S:    Maintaine
  F:    fs/autofs4/
  
  KERNEL BUILD
 +M:    Michal Marek <[email protected]>
 +T:    git git://repo.or.cz/linux-kbuild.git for-next
 +T:    git git://repo.or.cz/linux-kbuild.git for-linus
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/kbuild/
  F:    Makefile
  F:    scripts/Makefile.*
@@@ -3138,6 -3109,7 +3138,6 @@@ L:      [email protected]
  W:    http://kvm.qumranet.com
  S:    Supported
  F:    arch/x86/include/asm/svm.h
 -F:    arch/x86/kvm/kvm_svm.h
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
@@@ -3167,7 -3139,6 +3167,7 @@@ S:      Supporte
  F:    Documentation/s390/kvm.txt
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/kvm/
 +F:    drivers/s390/kvm/
  
  KEXEC
  M:    Eric Biederman <[email protected]>
@@@ -3273,7 -3244,6 +3273,7 @@@ LINUX FOR IBM pSERIES (RS/6000
  M:    Paul Mackerras <[email protected]>
  W:    http://www.ibm.com/linux/ltc/projects/ppc
  S:    Supported
 +F:    arch/powerpc/boot/rs6000.h
  
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
  M:    Benjamin Herrenschmidt <[email protected]>
@@@ -3282,24 -3252,18 +3282,24 @@@ W:   http://www.penguinppc.org
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
 +F:    Documentation/powerpc/
 +F:    arch/powerpc/
  
  LINUX FOR POWER MACINTOSH
  M:    Benjamin Herrenschmidt <[email protected]>
  W:    http://www.penguinppc.org/
  L:    [email protected]
  S:    Maintained
 +F:    arch/powerpc/platforms/powermac/
 +F:    drivers/macintosh/
  
  LINUX FOR POWERPC EMBEDDED MPC5XXX
  M:    Grant Likely <[email protected]>
  L:    [email protected]
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
 +F:    arch/powerpc/platforms/512x/
 +F:    arch/powerpc/platforms/52xx/
  
  LINUX FOR POWERPC EMBEDDED PPC4XX
  M:    Josh Boyer <[email protected]>
@@@ -3308,8 -3272,6 +3308,8 @@@ W:      http://www.penguinppc.org
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
  S:    Maintained
 +F:    arch/powerpc/platforms/40x/
 +F:    arch/powerpc/platforms/44x/
  
  LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
  M:    Grant Likely <[email protected]>
@@@ -3317,8 -3279,6 +3317,8 @@@ W:      http://wiki.secretlab.ca/index.php/L
  L:    [email protected]
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
 +F:    arch/powerpc/*/*virtex*
 +F:    arch/powerpc/*/*/*virtex*
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
  M:    Vitaly Bordug <[email protected]>
@@@ -3332,16 -3292,12 +3332,16 @@@ M:   Kumar Gala <[email protected]
  W:    http://www.penguinppc.org/
  L:    [email protected]
  S:    Maintained
 +F:    arch/powerpc/platforms/83xx/
  
  LINUX FOR POWERPC PA SEMI PWRFICIENT
  M:    Olof Johansson <[email protected]>
  W:    http://www.pasemi.com/
  L:    [email protected]
  S:    Supported
 +F:    arch/powerpc/platforms/pasemi/
 +F:    drivers/*/*pasemi*
 +F:    drivers/*/*/*pasemi*
  
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  M:    Chris Wright <[email protected]>
@@@ -3362,12 -3318,6 +3362,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/lis3lv02d
  F:    drivers/hwmon/lis3lv02d.*
  
 +LM73 HARDWARE MONITOR DRIVER
 +M:    Guillaume Ligneul <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/lm73.c
 +
  LM83 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -3416,10 -3366,8 +3416,10 @@@ S:    Maintaine
  F:    drivers/scsi/sym53c8xx_2/
  
  LTP (Linux Test Project)
 -M:    Subrata Modak <[email protected]>
 -M:    Mike Frysinger <[email protected]>
 +M:    Rishikesh K Rajak <[email protected]>
 +M:    Garrett Cooper <[email protected]>
 +M:     Mike Frysinger <[email protected]>
 +M:     Subrata Modak <[email protected]>
  L:    [email protected] (subscribers-only)
  W:    http://ltp.sourceforge.net/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
@@@ -3495,16 -3443,16 +3495,16 @@@ S:   Maintaine
  F:    drivers/net/wireless/libertas/
  
  MARVELL MV643XX ETHERNET DRIVER
 -M:    Lennert Buytenhek <buytenh@marvell.com>
 +M:    Lennert Buytenhek <buytenh@wantstofly.org>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/mv643xx_eth.*
  F:    include/linux/mv643xx.h
  
  MARVELL MWL8K WIRELESS DRIVER
- M:    Lennert Buytenhek <buytenh@marvell.com>
+ M:    Lennert Buytenhek <buytenh@wantstofly.org>
  L:    [email protected]
- S:    Supported
+ S:    Maintained
  F:    drivers/net/wireless/mwl8k.c
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@@ -3648,11 -3596,6 +3648,11 @@@ W:    http://0pointer.de/lennart/tchibo.ht
  S:    Maintained
  F:    drivers/platform/x86/msi-laptop.c
  
 +MSI WMI SUPPORT
 +M:    Anisse Astier <[email protected]>
 +S:    Supported
 +F:    drivers/platform/x86/msi-wmi.c
 +
  MULTIFUNCTION DEVICES (MFD)
  M:    Samuel Ortiz <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
@@@ -3686,7 -3629,7 +3686,7 @@@ F:      include/linux/isicom.
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
  M:    Felipe Balbi <[email protected]>
  L:    [email protected]
 -T:    git git://gitorious.org/musb/mainline.git
 +T:    git git://gitorious.org/usb/usb.git
  S:    Maintained
  F:    drivers/usb/musb/
  
@@@ -3843,7 -3786,6 +3843,7 @@@ NETWORKING DRIVER
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
  S:    Odd Fixes
  F:    drivers/net/
  F:    include/linux/if_*
@@@ -3879,7 -3821,7 +3879,7 @@@ F:      drivers/net/ni5010.
  
  NILFS2 FILESYSTEM
  M:    KONISHI Ryusuke <[email protected]>
 -L:    users@nilfs.org
 +L:    [email protected].org
  W:    http://www.nilfs.org/en/
  S:    Supported
  F:    Documentation/filesystems/nilfs2.txt
@@@ -3946,20 -3888,12 +3946,20 @@@ S:   Maintaine
  F:    sound/soc/omap/
  
  OMAP FRAMEBUFFER SUPPORT
 -M:    Imre Deak <imre.deak@nokia.com>
 +M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/video/omap/
  
 +OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 +M:    Tomi Valkeinen <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/video/omap2/
 +F:    Documentation/arm/OMAP/DSS
 +
  OMAP MMC SUPPORT
  M:    Jarkko Lavinen <[email protected]>
  L:    [email protected]
@@@ -4261,13 -4195,6 +4261,13 @@@ W:    http://www.pmc-sierra.com
  S:    Supported
  F:    drivers/scsi/pmcraid.*
  
 +PMC SIERRA PM8001 DRIVER
 +M:    [email protected]
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/pm8001/
 +
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <[email protected]>
  S:    Supported
@@@ -4451,13 -4378,6 +4451,13 @@@ S:    Supporte
  F:    Documentation/networking/LICENSE.qla3xxx
  F:    drivers/net/qla3xxx.*
  
 +QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 +M:    Amit Kumar Salecha <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/qlcnic/
 +
  QLOGIC QLGE 10Gb ETHERNET DRIVER
  M:    Ron Mercer <[email protected]>
  M:    [email protected]
@@@ -4633,7 -4553,6 +4633,7 @@@ L:      [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    arch/s390/
 +F:    drivers/s390/
  
  S390 NETWORK DRIVERS
  M:    Ursula Braun <[email protected]>
@@@ -4649,7 -4568,6 +4649,7 @@@ M:      Felix Beck <[email protected]
  M:    Ralph Wuerthner <[email protected]>
  M:    [email protected]
  L:    [email protected]
 +W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/s390/crypto/
  
@@@ -4844,8 -4762,6 +4844,8 @@@ F:      drivers/scsi/be2iscsi
  SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
  M:    Sathya Perla <[email protected]>
  M:    Subbu Seetharaman <[email protected]>
 +M:    Sarveshwar Bandi <[email protected]>
 +M:    Ajit Khaparde <[email protected]>
  L:    [email protected]
  W:    http://www.serverengines.com
  S:    Supported
@@@ -5101,7 -5017,6 +5101,7 @@@ F:      drivers/char/specialix
  
  SPI SUBSYSTEM
  M:    David Brownell <[email protected]>
 +M:    Grant Likely <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/spi/
@@@ -5402,7 -5317,7 +5402,7 @@@ S:      Maintaine
  F:    drivers/scsi/u14-34f.c
  
  UBI FILE SYSTEM (UBIFS)
 -M:    Artem Bityutskiy <dedekind@infradead.org>
 +M:    Artem Bityutskiy <dedekind[email protected]>
  M:    Adrian Hunter <[email protected]>
  L:    [email protected]
  T:    git git://git.infradead.org/ubifs-2.6.git
@@@ -5440,19 -5355,10 +5440,19 @@@ ULTRA-WIDEBAND (UWB) SUBSYSTEM
  M:    David Vrabel <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/uwb/*
 +F:    drivers/uwb/
 +X:    drivers/uwb/wlp/
 +X:    drivers/uwb/i1480/i1480u-wlp/
 +X:    drivers/uwb/i1480/i1480-wlp.h
  F:    include/linux/uwb.h
  F:    include/linux/uwb/
  
 +UNIFDEF
 +M:    Tony Finch <[email protected]>
 +W:    http://dotat.at/prog/unifdef
 +S:    Maintained
 +F:    scripts/unifdef.c
 +
  UNIFORM CDROM DRIVER
  M:    Jens Axboe <[email protected]>
  W:    http://www.kernel.dk
@@@ -5462,7 -5368,7 +5462,7 @@@ F:      drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  
  UNSORTED BLOCK IMAGES (UBI)
 -M:    Artem Bityutskiy <dedekind@infradead.org>
 +M:    Artem Bityutskiy <dedekind[email protected]>
  W:    http://www.linux-mtd.infradead.org/
  L:    [email protected]
  T:    git git://git.infradead.org/ubi-2.6.git
@@@ -5485,9 -5391,10 +5485,9 @@@ S:     Supporte
  F:    drivers/block/ub.c
  
  USB CDC ETHERNET DRIVER
 -M:    Greg Kroah-Hartman <[email protected]>
 +M:    Oliver Neukum <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.kroah.com/linux-usb/
  F:    drivers/net/usb/cdc_*.c
  F:    include/linux/usb/cdc.h
  
@@@ -5738,11 -5645,9 +5738,11 @@@ S:    Maintaine
  F:    drivers/net/wireless/rndis_wlan.c
  
  USB XHCI DRIVER
 -M:    Sarah Sharp <[email protected]>
 +M:    Sarah Sharp <sarah.a.sharp@linux.intel.com>
  L:    [email protected]
  S:    Supported
 +F:    drivers/usb/host/xhci*
 +F:    drivers/usb/host/pci-quirks*
  
  USB ZC0301 DRIVER
  M:    Luca Risolia <[email protected]>
@@@ -5811,15 -5716,6 +5811,15 @@@ S:    Maintaine
  F:    Documentation/filesystems/vfat.txt
  F:    fs/fat/
  
 +VIRTIO HOST (VHOST)
 +M:    "Michael S. Tsirkin" <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vhost/
 +F:    include/linux/vhost.h
 +
  VIA RHINE NETWORK DRIVER
  M:    Roger Luethi <[email protected]>
  S:    Maintained
@@@ -5873,14 -5769,6 +5873,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/net/vmxnet3/
  
 +VMware PVSCSI driver
 +M:    Alok Kataria <[email protected]>
 +M:    VMware PV-Drivers <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/scsi/vmw_pvscsi.c
 +F:    drivers/scsi/vmw_pvscsi.h
 +
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
@@@ -5965,12 -5853,9 +5965,12 @@@ W:    http://linuxwimax.or
  
  WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
  M:    David Vrabel <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    include/linux/wlp.h
  F:    drivers/uwb/wlp/
 +F:    drivers/uwb/i1480/i1480u-wlp/
 +F:    drivers/uwb/i1480/i1480-wlp.h
  
  WISTRON LAPTOP BUTTON DRIVER
  M:    Miloslav Trmac <[email protected]>
@@@ -6016,7 -5901,6 +6016,7 @@@ M:      Mark Brown <[email protected]
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
  W:    http://opensource.wolfsonmicro.com/node/8
  S:    Supported
 +F:    Documentation/hwmon/wm83??
  F:    drivers/leds/leds-wm83*.c
  F:    drivers/mfd/wm8*.c
  F:    drivers/power/wm83*.c
@@@ -6026,14 -5910,14 +6026,14 @@@ F:   drivers/video/backlight/wm83*_bl.
  F:    drivers/watchdog/wm83*_wdt.c
  F:    include/linux/mfd/wm831x/
  F:    include/linux/mfd/wm8350/
 -F:    include/linux/mfd/wm8400/
 -F:    sound/soc/codecs/wm8350.c
 -F:    sound/soc/codecs/wm8400.c
 +F:    include/linux/mfd/wm8400*
 +F:    sound/soc/codecs/wm8350.*
 +F:    sound/soc/codecs/wm8400.*
  
  X.25 NETWORK LAYER
 -M:    Henner Eisen <[email protected]>
 +M:    Andrew Hendry <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/networking/x25*
  F:    include/net/x25*
  F:    net/x25/

diff --combined drivers/net/wireless/b43/main.c
index aa33d741e5e60211c5c8c15c70a7f14647d420e1,16580d0d3a02a913ff60f4abf1e553623f2a576f..1521b1e78d2194309a0b12cd836925b07b9d5a85
--- 1/drivers/net/wireless/b43/main.c
--- 2/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -107,9 -107,9 +107,9 @@@ int b43_modparam_verbose = B43_VERBOSIT
  module_param_named(verbose, b43_modparam_verbose, int, 0644);
  MODULE_PARM_DESC(verbose, "Log message verbosity: 0=error, 1=warn, 2=info(default), 3=debug");
  
- static int modparam_pio;
- module_param_named(pio, modparam_pio, int, 0444);
- MODULE_PARM_DESC(pio, "enable(1) / disable(0) PIO mode");
+ int b43_modparam_pio = B43_PIO_DEFAULT;
+ module_param_named(pio, b43_modparam_pio, int, 0644);
+ MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");
  
  static const struct ssb_device_id b43_ssb_tbl[] = {
        SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 5),
@@@ -1804,8 -1804,9 +1804,9 @@@ static void b43_do_interrupt_thread(str
                               dma_reason[4], dma_reason[5]);
                        b43err(dev->wl, "This device does not support DMA "
                               "on your system. Please use PIO instead.\n");
-                       b43err(dev->wl, "Unload the b43 module and reload "
-                              "with 'pio=1'\n");
+                       /* Fall back to PIO transfers if we get fatal DMA errors! */
+                       dev->use_pio = 1;
+                       b43_controller_restart(dev, "DMA error");
                        return;
                }
                if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) {
@@@ -2976,7 -2977,7 +2977,7 @@@ static void do_periodic_work(struct b43
  /* Periodic work locking policy:
   *    The whole periodic work handler is protected by
   *    wl->mutex. If another lock is needed somewhere in the
 - *    pwork callchain, it's aquired in-place, where it's needed.
 + *    pwork callchain, it's acquired in-place, where it's needed.
   */
  static void b43_periodic_work_handler(struct work_struct *work)
  {
@@@ -4357,7 -4358,7 +4358,7 @@@ static int b43_wireless_core_init(struc
  
        if ((dev->dev->bus->bustype == SSB_BUSTYPE_PCMCIA) ||
            (dev->dev->bus->bustype == SSB_BUSTYPE_SDIO) ||
-           modparam_pio) {
+           dev->use_pio) {
                dev->__using_pio_transfers = 1;
                err = b43_pio_init(dev);
        } else {
@@@ -4824,6 -4825,7 +4825,7 @@@ static int b43_one_core_attach(struct s
        if (!wldev)
                goto out;
  
+       wldev->use_pio = b43_modparam_pio;
        wldev->dev = dev;
        wldev->wl = wl;
        b43_set_status(wldev, B43_STAT_UNINIT);

diff --combined drivers/net/wireless/iwlwifi/iwl-agn.c
index af60b178ad4bfc993137df51386fdae1e6988f8c,1fac015efc19d9b722fdab07efa7d3f378863a7a..6aeb82b6992f572bfad0c4ed79a94b3822086eb6
--- 1/drivers/net/wireless/iwlwifi/iwl-agn.c
--- 2/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@@ -2941,21 -2941,10 +2941,10 @@@ static int iwl_mac_ampdu_action(struct 
                        return ret;
        case IEEE80211_AMPDU_TX_START:
                IWL_DEBUG_HT(priv, "start Tx\n");
-               ret = iwl_tx_agg_start(priv, sta->addr, tid, ssn);
-               if (ret == 0) {
-                       priv->agg_tids_count++;
-                       IWL_DEBUG_HT(priv, "priv->agg_tids_count = %u\n",
-                               priv->agg_tids_count);
-               }
-               return ret;
+               return iwl_tx_agg_start(priv, sta->addr, tid, ssn);
        case IEEE80211_AMPDU_TX_STOP:
                IWL_DEBUG_HT(priv, "stop Tx\n");
                ret = iwl_tx_agg_stop(priv, sta->addr, tid);
-               if ((ret == 0) && (priv->agg_tids_count > 0)) {
-                       priv->agg_tids_count--;
-                       IWL_DEBUG_HT(priv, "priv->agg_tids_count = %u\n",
-                               priv->agg_tids_count);
-               }
                if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                        return 0;
                else
@@@ -3376,7 -3365,6 +3365,6 @@@ static int iwl_init_drv(struct iwl_pri
        priv->iw_mode = NL80211_IFTYPE_STATION;
        priv->current_ht_config.smps = IEEE80211_SMPS_STATIC;
        priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;
-       priv->agg_tids_count = 0;
  
        /* initialize force reset */
        priv->force_reset[IWL_RF_RESET].reset_duration =
@@@ -3795,7 -3783,7 +3783,7 @@@ static void __devexit iwl_pci_remove(st
   *****************************************************************************/
  
  /* Hardware specific file defines the PCI IDs table for that hardware module */
 -static struct pci_device_id iwl_hw_card_ids[] = {
 +static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
  #ifdef CONFIG_IWL4965
        {IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)},
        {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)},

diff --combined include/linux/netdevice.h
index 682d02521bbc16be2bf464def9e381342c60e7fc,99914e6fa3fdf0a60e518e035e590410c702ec16..7a2aea56f195327e9b89a21036fda4a611219f81
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -28,7 -28,6 +28,7 @@@
  #include <linux/if.h>
  #include <linux/if_ether.h>
  #include <linux/if_packet.h>
 +#include <linux/if_link.h>
  
  #ifdef __KERNEL__
  #include <linux/timer.h>
@@@ -137,7 -136,7 +137,7 @@@ static inline bool dev_xmit_complete(in
   *    used.
   */
  
- #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+ #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
  # if defined(CONFIG_MAC80211_MESH)
  #  define LL_MAX_HEADER 128
  # else
@@@ -264,17 -263,6 +264,17 @@@ struct netdev_hw_addr_list 
        int                     count;
  };
  
 +#define netdev_uc_count(dev) ((dev)->uc.count)
 +#define netdev_uc_empty(dev) ((dev)->uc.count == 0)
 +#define netdev_for_each_uc_addr(ha, dev) \
 +      list_for_each_entry(ha, &dev->uc.list, list)
 +
 +#define netdev_mc_count(dev) ((dev)->mc_count)
 +#define netdev_mc_empty(dev) (netdev_mc_count(dev) == 0)
 +
 +#define netdev_for_each_mc_addr(mclist, dev) \
 +      for (mclist = dev->mc_list; mclist; mclist = mclist->next)
 +
  struct hh_cache {
        struct hh_cache *hh_next;       /* Next entry                        */
        atomic_t        hh_refcnt;      /* number of users                   */
@@@ -622,13 -610,6 +622,13 @@@ struct netdev_queue 
   *    this function is called when a VLAN id is unregistered.
   *
   * void (*ndo_poll_controller)(struct net_device *dev);
 + *
 + *    SR-IOV management functions.
 + * int (*ndo_set_vf_mac)(struct net_device *dev, int vf, u8* mac);
 + * int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan, u8 qos);
 + * int (*ndo_set_vf_tx_rate)(struct net_device *dev, int vf, int rate);
 + * int (*ndo_get_vf_config)(struct net_device *dev,
 + *                        int vf, struct ifla_vf_info *ivf);
   */
  #define HAVE_NET_DEVICE_OPS
  struct net_device_ops {
@@@ -640,21 -621,30 +640,21 @@@
                                                   struct net_device *dev);
        u16                     (*ndo_select_queue)(struct net_device *dev,
                                                    struct sk_buff *skb);
 -#define HAVE_CHANGE_RX_FLAGS
        void                    (*ndo_change_rx_flags)(struct net_device *dev,
                                                       int flags);
 -#define HAVE_SET_RX_MODE
        void                    (*ndo_set_rx_mode)(struct net_device *dev);
 -#define HAVE_MULTICAST
        void                    (*ndo_set_multicast_list)(struct net_device *dev);
 -#define HAVE_SET_MAC_ADDR
        int                     (*ndo_set_mac_address)(struct net_device *dev,
                                                       void *addr);
 -#define HAVE_VALIDATE_ADDR
        int                     (*ndo_validate_addr)(struct net_device *dev);
 -#define HAVE_PRIVATE_IOCTL
        int                     (*ndo_do_ioctl)(struct net_device *dev,
                                                struct ifreq *ifr, int cmd);
 -#define HAVE_SET_CONFIG
        int                     (*ndo_set_config)(struct net_device *dev,
                                                  struct ifmap *map);
 -#define HAVE_CHANGE_MTU
        int                     (*ndo_change_mtu)(struct net_device *dev,
                                                  int new_mtu);
        int                     (*ndo_neigh_setup)(struct net_device *dev,
                                                   struct neigh_parms *);
 -#define HAVE_TX_TIMEOUT
        void                    (*ndo_tx_timeout) (struct net_device *dev);
  
        struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
@@@ -666,17 -656,9 +666,17 @@@
        void                    (*ndo_vlan_rx_kill_vid)(struct net_device *dev,
                                                        unsigned short vid);
  #ifdef CONFIG_NET_POLL_CONTROLLER
 -#define HAVE_NETDEV_POLL
        void                    (*ndo_poll_controller)(struct net_device *dev);
  #endif
 +      int                     (*ndo_set_vf_mac)(struct net_device *dev,
 +                                                int queue, u8 *mac);
 +      int                     (*ndo_set_vf_vlan)(struct net_device *dev,
 +                                                 int queue, u16 vlan, u8 qos);
 +      int                     (*ndo_set_vf_tx_rate)(struct net_device *dev,
 +                                                    int vf, int rate);
 +      int                     (*ndo_get_vf_config)(struct net_device *dev,
 +                                                   int vf,
 +                                                   struct ifla_vf_info *ivf);
  #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
        int                     (*ndo_fcoe_enable)(struct net_device *dev);
        int                     (*ndo_fcoe_disable)(struct net_device *dev);
@@@ -763,7 -745,6 +763,7 @@@ struct net_device 
  #define NETIF_F_FCOE_CRC      (1 << 24) /* FCoE CRC32 */
  #define NETIF_F_SCTP_CSUM     (1 << 25) /* SCTP checksum offload */
  #define NETIF_F_FCOE_MTU      (1 << 26) /* Supports max FCoE MTU, 2158 bytes*/
 +#define NETIF_F_NTUPLE                (1 << 27) /* N-tuple filters supported */
  
        /* Segmentation offload features */
  #define NETIF_F_GSO_SHIFT     16
@@@ -972,8 -953,6 +972,8 @@@
        /* max exchange id for FCoE LRO by ddp */
        unsigned int            fcoe_ddp_xid;
  #endif
 +      /* n-tuple filter list attached to this device */
 +      struct ethtool_rx_ntuple_list ethtool_ntuple_list;
  };
  #define to_net_dev(d) container_of(d, struct net_device, dev)
  
@@@ -1030,15 -1009,6 +1030,15 @@@ static inline bool netdev_uses_dsa_tags
        return 0;
  }
  
 +#ifndef CONFIG_NET_NS
 +static inline void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
 +{
 +      skb->dev = dev;
 +}
 +#else /* CONFIG_NET_NS */
 +void skb_set_dev(struct sk_buff *skb, struct net_device *dev);
 +#endif
 +
  static inline bool netdev_uses_trailer_tags(struct net_device *dev)
  {
  #ifdef CONFIG_NET_DSA_TAG_TRAILER
@@@ -1557,6 -1527,7 +1557,6 @@@ extern int              netif_rx(struct sk_buff *sk
  extern int            netif_rx_ni(struct sk_buff *skb);
  #define HAVE_NETIF_RECEIVE_SKB 1
  extern int            netif_receive_skb(struct sk_buff *skb);
 -extern void           napi_gro_flush(struct napi_struct *napi);
  extern gro_result_t   dev_gro_receive(struct napi_struct *napi,
                                        struct sk_buff *skb);
  extern gro_result_t   napi_skb_finish(gro_result_t ret, struct sk_buff *skb);
@@@ -2112,130 -2083,6 +2112,130 @@@ static inline u32 dev_ethtool_get_flags
                return 0;
        return dev->ethtool_ops->get_flags(dev);
  }
 +
 +/* Logging, debugging and troubleshooting/diagnostic helpers. */
 +
 +/* netdev_printk helpers, similar to dev_printk */
 +
 +static inline const char *netdev_name(const struct net_device *dev)
 +{
 +      if (dev->reg_state != NETREG_REGISTERED)
 +              return "(unregistered net_device)";
 +      return dev->name;
 +}
 +
 +#define netdev_printk(level, netdev, format, args...)         \
 +      dev_printk(level, (netdev)->dev.parent,                 \
 +                 "%s: " format,                               \
 +                 netdev_name(netdev), ##args)
 +
 +#define netdev_emerg(dev, format, args...)                    \
 +      netdev_printk(KERN_EMERG, dev, format, ##args)
 +#define netdev_alert(dev, format, args...)                    \
 +      netdev_printk(KERN_ALERT, dev, format, ##args)
 +#define netdev_crit(dev, format, args...)                     \
 +      netdev_printk(KERN_CRIT, dev, format, ##args)
 +#define netdev_err(dev, format, args...)                      \
 +      netdev_printk(KERN_ERR, dev, format, ##args)
 +#define netdev_warn(dev, format, args...)                     \
 +      netdev_printk(KERN_WARNING, dev, format, ##args)
 +#define netdev_notice(dev, format, args...)                   \
 +      netdev_printk(KERN_NOTICE, dev, format, ##args)
 +#define netdev_info(dev, format, args...)                     \
 +      netdev_printk(KERN_INFO, dev, format, ##args)
 +
 +#if defined(DEBUG)
 +#define netdev_dbg(__dev, format, args...)                    \
 +      netdev_printk(KERN_DEBUG, __dev, format, ##args)
 +#elif defined(CONFIG_DYNAMIC_DEBUG)
 +#define netdev_dbg(__dev, format, args...)                    \
 +do {                                                          \
 +      dynamic_dev_dbg((__dev)->dev.parent, "%s: " format,     \
 +                      netdev_name(__dev), ##args);            \
 +} while (0)
 +#else
 +#define netdev_dbg(__dev, format, args...)                    \
 +({                                                            \
 +      if (0)                                                  \
 +              netdev_printk(KERN_DEBUG, __dev, format, ##args); \
 +      0;                                                      \
 +})
 +#endif
 +
 +#if defined(VERBOSE_DEBUG)
 +#define netdev_vdbg   netdev_dbg
 +#else
 +
 +#define netdev_vdbg(dev, format, args...)                     \
 +({                                                            \
 +      if (0)                                                  \
 +              netdev_printk(KERN_DEBUG, dev, format, ##args); \
 +      0;                                                      \
 +})
 +#endif
 +
 +/*
 + * netdev_WARN() acts like dev_printk(), but with the key difference
 + * of using a WARN/WARN_ON to get the message out, including the
 + * file/line information and a backtrace.
 + */
 +#define netdev_WARN(dev, format, args...)                     \
 +      WARN(1, "netdevice: %s\n" format, netdev_name(dev), ##args);
 +
 +/* netif printk helpers, similar to netdev_printk */
 +
 +#define netif_printk(priv, type, level, dev, fmt, args...)    \
 +do {                                                          \
 +      if (netif_msg_##type(priv))                             \
 +              netdev_printk(level, (dev), fmt, ##args);       \
 +} while (0)
 +
 +#define netif_emerg(priv, type, dev, fmt, args...)            \
 +      netif_printk(priv, type, KERN_EMERG, dev, fmt, ##args)
 +#define netif_alert(priv, type, dev, fmt, args...)            \
 +      netif_printk(priv, type, KERN_ALERT, dev, fmt, ##args)
 +#define netif_crit(priv, type, dev, fmt, args...)             \
 +      netif_printk(priv, type, KERN_CRIT, dev, fmt, ##args)
 +#define netif_err(priv, type, dev, fmt, args...)              \
 +      netif_printk(priv, type, KERN_ERR, dev, fmt, ##args)
 +#define netif_warn(priv, type, dev, fmt, args...)             \
 +      netif_printk(priv, type, KERN_WARNING, dev, fmt, ##args)
 +#define netif_notice(priv, type, dev, fmt, args...)           \
 +      netif_printk(priv, type, KERN_NOTICE, dev, fmt, ##args)
 +#define netif_info(priv, type, dev, fmt, args...)             \
 +      netif_printk(priv, type, KERN_INFO, (dev), fmt, ##args)
 +
 +#if defined(DEBUG)
 +#define netif_dbg(priv, type, dev, format, args...)           \
 +      netif_printk(priv, type, KERN_DEBUG, dev, format, ##args)
 +#elif defined(CONFIG_DYNAMIC_DEBUG)
 +#define netif_dbg(priv, type, netdev, format, args...)                \
 +do {                                                          \
 +      if (netif_msg_##type(priv))                             \
 +              dynamic_dev_dbg((netdev)->dev.parent,           \
 +                              "%s: " format,                  \
 +                              netdev_name(netdev), ##args);   \
 +} while (0)
 +#else
 +#define netif_dbg(priv, type, dev, format, args...)                   \
 +({                                                                    \
 +      if (0)                                                          \
 +              netif_printk(priv, type, KERN_DEBUG, dev, format, ##args); \
 +      0;                                                              \
 +})
 +#endif
 +
 +#if defined(VERBOSE_DEBUG)
 +#define netif_vdbg    netdev_dbg
 +#else
 +#define netif_vdbg(priv, type, dev, format, args...)          \
 +({                                                            \
 +      if (0)                                                  \
 +              netif_printk(KERN_DEBUG, dev, format, ##args);  \
 +      0;                                                      \
 +})
 +#endif
 +
  #endif /* __KERNEL__ */
  
  #endif        /* _LINUX_NETDEVICE_H */