Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB: Fix information leak in marshalling code
  IB/pack: Remove some unused code added by the IBoE patches
  IB/mlx4: Fix IBoE link state
  IB/mlx4: Fix IBoE reported link rate
  mlx4_core: Workaround firmware bug in query dev cap
  IB/mlx4: Fix memory ordering of VLAN insertion control bits
  MAINTAINERS: Update NetEffect entry

diff --combined MAINTAINERS
index 3eafe9ee086e47f690428701b017012731547692,e067aa959d4722f68e90d1e9cab27cbc1517515d..74b8e050bf746ef5e2b92724b3699e6500f6e662
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -161,7 -161,7 +161,7 @@@ M: Greg Kroah-Hartman <[email protected]
  L:    [email protected]
  W:    http://serial.sourceforge.net
  S:    Maintained
 -T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
  F:    drivers/serial/8250*
  F:    include/linux/serial_8250.h
  
@@@ -432,7 -432,7 +432,7 @@@ AMS (Apple Motion Sensor) DRIVE
  M:    Stelian Pop <[email protected]>
  M:    Michael Hanselmann <[email protected]>
  S:    Supported
 -F:    drivers/hwmon/ams/
 +F:    drivers/macintosh/ams/
  
  AMSO1100 RNIC DRIVER
  M:    Tom Tucker <[email protected]>
@@@ -945,7 -945,7 +945,7 @@@ M: Magnus Damm <[email protected]
  L:    [email protected]
  W:    http://oss.renesas.com
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest
  S:    Supported
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
@@@ -1359,7 -1359,7 +1359,7 @@@ F:      include/net/bluetooth
  
  BONDING DRIVER
  M:    Jay Vosburgh <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
  F:    drivers/net/bonding/
@@@ -1391,14 -1391,6 +1391,14 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/net/tg3.*
  
 +BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 +M:    Brett Rudley <[email protected]>
 +M:    Henry Ptasinski <[email protected]>
 +M:    Nohee Ko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/staging/brcm80211/
 +
  BROCADE BFA FC SCSI DRIVER
  M:    Jing Huang <[email protected]>
  L:    [email protected]
@@@ -1613,7 -1605,7 +1613,7 @@@ F:      drivers/platform/x86/classmate-lapto
  COCCINELLE/Semantic Patches (SmPL)
  M:    Julia Lawall <[email protected]>
  M:    Gilles Muller <[email protected]>
 -M:    Nicolas Palix <npalix@diku.dk>
 +M:    Nicolas Palix <npalix[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://coccinelle.lip6.fr/
  S:    Supported
@@@ -1757,7 -1749,6 +1757,7 @@@ L:      [email protected]
  W:    http://developer.axis.com
  S:    Maintained
  F:    arch/cris/
 +F:    drivers/serial/crisv10.*
  
  CRYPTO API
  M:    Herbert Xu <[email protected]>
@@@ -1829,13 -1820,6 +1829,13 @@@ W:    http://www.chelsio.co
  S:    Supported
  F:    drivers/net/cxgb4vf/
  
 +STMMAC ETHERNET DRIVER
 +M:    Giuseppe Cavallaro <[email protected]>
 +L:    [email protected]
 +W:    http://www.stlinux.com
 +S:    Supported
 +F:    drivers/net/stmmac/
 +
  CYBERPRO FB DRIVER
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2015,7 -1999,6 +2015,7 @@@ F:      drivers/hwmon/dme1737.
  DOCBOOK FOR DOCUMENTATION
  M:    Randy Dunlap <[email protected]>
  S:    Maintained
 +F:    scripts/kernel-doc
  
  DOCKING STATION DRIVER
  M:    Shaohua Li <[email protected]>
@@@ -2026,7 -2009,6 +2026,7 @@@ F:      drivers/acpi/dock.
  DOCUMENTATION
  M:    Randy Dunlap <[email protected]>
  L:    [email protected]
 +T:    quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/
  S:    Maintained
  F:    Documentation/
  
@@@ -2080,7 -2062,7 +2080,7 @@@ F:      include/drm
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Chris Wilson <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (subscribers-only)
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
  S:    Supported
@@@ -2444,12 -2426,9 +2444,12 @@@ F:    drivers/net/wan/sdla.
  FRAMEBUFFER LAYER
  L:    [email protected]
  W:    http://linux-fbdev.sourceforge.net/
 +Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
  S:    Orphan
  F:    Documentation/fb/
 -F:    drivers/video/fb*
 +F:    drivers/video/
 +F:    include/video/
  F:    include/linux/fb.h
  
  FREESCALE DMA DRIVER
@@@ -3404,8 -3383,8 +3404,8 @@@ F:      Documentation/kdump
  KERNEL AUTOMOUNTER (AUTOFS)
  M:    "H. Peter Anvin" <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 -F:    fs/autofs/
 +S:    Obsolete
 +F:    drivers/staging/autofs/
  
  KERNEL AUTOMOUNTER v4 (AUTOFS4)
  M:    Ian Kent <[email protected]>
@@@ -4064,9 -4043,8 +4064,8 @@@ F:      drivers/scsi/NCR_D700.
  
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  M:    Faisal Latif <[email protected]>
- M:    Chien Tung <[email protected]>
  L:    [email protected]
- W:    http://www.neteffect.com
+ W:    http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
  S:    Supported
  F:    drivers/infiniband/hw/nes/
  
@@@ -4469,7 -4447,7 +4468,7 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/platform/x86/panasonic-laptop.c
  
 -PANASONIC MN10300/AM33 PORT
 +PANASONIC MN10300/AM33/AM34 PORT
  M:    David Howells <[email protected]>
  M:    Koichi Yasutake <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -5688,7 -5666,7 +5687,7 @@@ S:      Maintaine
  
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
 -T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/
@@@ -5717,7 -5695,7 +5716,7 @@@ M:      Paul Mundt <[email protected]
  L:    [email protected]
  W:    http://www.linux-sh.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest
  S:    Supported
  F:    Documentation/sh/
  F:    arch/sh/
@@@ -5839,8 -5817,6 +5838,8 @@@ M:      Chris Metcalf <[email protected]
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
 +F:    drivers/char/hvc_tile.c
 +F:    drivers/net/tile/
  
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <[email protected]>
@@@ -5924,7 -5900,7 +5923,7 @@@ S:      Maintaine
  TTY LAYER
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
 -T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
  F:    drivers/char/tty_*
  F:    drivers/serial/serial_core.c
  F:    include/linux/serial_core.h
@@@ -6247,7 -6223,7 +6246,7 @@@ USB SUBSYSTE
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
  W:    http://www.linux-usb.org
 -T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
  S:    Supported
  F:    Documentation/usb/
  F:    drivers/net/usb/
@@@ -6480,12 -6456,6 +6479,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/w83793
  F:    drivers/hwmon/w83793.c
  
 +W83795 HARDWARE MONITORING DRIVER
 +M:    Jean Delvare <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/w83795.c
 +
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  M:    Pierre Ossman <[email protected]>
  S:    Maintained
@@@ -6610,25 -6580,11 +6609,25 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/platform/x86
  
 +XEN PCI SUBSYSTEM
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/x86/pci/*xen*
 +F:    drivers/pci/*xen*
 +
 +XEN SWIOTLB SUBSYSTEM
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/x86/xen/*swiotlb*
 +F:    drivers/xen/*swiotlb*
 +
  XEN HYPERVISOR INTERFACE
 -M:    Jeremy Fitzhardinge <[email protected]>
 -M:    Chris Wright <[email protected]>
 +M:    Jeremy Fitzhardinge <[email protected]>
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
 -L:    [email protected]
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c