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

diff --combined MAINTAINERS
index 43de305c32134c19475c5195a77d9ba1aaaf1836,185b84a51036c772b0a7ba85ce640840be751351..d643e862b8e49af7ddc15243f310703278f199e3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -347,7 -347,7 +347,7 @@@ S: Maintaine
  ALI1563 I2C DRIVER
  P:    Rudolf Marek
  M:    r.marek@assembler.cz
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
  ALPHA PORT
@@@ -610,11 -610,6 +610,11 @@@ P:       Philipp Zabe
  M:    philipp.zabel@gmail.com
  S:    Maintained
  
 +ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 +P:    Michael Petchkovsky
 +M:    mkpetch@internode.on.net
 +S:    Maintained
 +
  ARM/TOSA MACHINE SUPPORT
  P:    Dmitry Baryshkov
  M:    dbaryshkov@gmail.com
@@@ -743,6 -738,8 +743,8 @@@ P: Nick Kossifidi
  M:    mickflemm@gmail.com
  P:    Luis R. Rodriguez
  M:    mcgrof@gmail.com
+ P:    Bob Copeland
+ M:    me@bobcopeland.com
  L:    linux-wireless@vger.kernel.org
  L:    ath5k-devel@lists.ath5k.org
  S:    Maintained
@@@ -1754,7 -1751,7 +1756,7 @@@ FREESCALE I2C CPM DRIVE
  P:    Jochen Friedrich
  M:    jochen@scram.de
  L:    linuxppc-dev@ozlabs.org
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
  FREESCALE SOC FS_ENET DRIVER
@@@ -2027,7 -2024,7 +2029,7 @@@ S:      Maintaine
  I2C/SMBUS STUB DRIVER
  P:    Mark M. Hoffman
  M:    mhoffman@lightlink.com
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
  I2C SUBSYSTEM
@@@ -2035,14 -2032,14 +2037,14 @@@ P:   Jean Delvare (PC drivers, core
  M:    khali@linux-fr.org
  P:    Ben Dooks (embedded platforms)
  M:    ben-linux@fluff.org
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.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
 +L:    linux-i2c@vger.kernel.org
  T:    http://www.harbaum.org/till/i2c_tiny_usb
  S:    Maintained
  
@@@ -2706,16 -2703,6 +2708,16 @@@ M:    matthew@wil.c
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
 +LTP (Linux Test Project)
 +P:    Subrata Modak
 +M:    subrata@linux.vnet.ibm.com
 +P:    Mike Frysinger
 +M:    vapier@gentoo.org
 +L:    ltp-list@lists.sourceforge.net (subscribers-only)
 +W:    http://ltp.sourceforge.net/
 +T:    git kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
 +S:    Maintained
 +
  M32R ARCHITECTURE
  P:    Hirokazu Takata
  M:    takata@linux-m32r.org
@@@ -3158,7 -3145,7 +3160,7 @@@ S:      Maintaine
  OPENCORES I2C BUS DRIVER
  P:    Peter Korsgaard
  M:    jacmet@sunsite.dk
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
  OPROFILE
@@@ -3205,7 -3192,7 +3207,7 @@@ S:      Maintaine
  PA SEMI SMBUS DRIVER
  P:    Olof Johansson
  M:    olof@lixom.net
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
  PANASONIC LAPTOP ACPI EXTRAS DRIVER
@@@ -3350,7 -3337,7 +3352,7 @@@ S:      Maintaine
  PNXxxxx I2C DRIVER
  P:    Vitaly Wool
  M:    vitalywool@gmail.com
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
  PPP PROTOCOL DRIVERS AND COMPRESSORS
@@@ -3814,7 -3801,7 +3816,7 @@@ S:      Maintaine
  SIS 96X I2C/SMBUS DRIVER
  P:    Mark M. Hoffman
  M:    mhoffman@lightlink.com
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
  SIS FRAMEBUFFER DRIVER
@@@ -4561,7 -4548,7 +4563,7 @@@ S:      Maintaine
  VIAPRO SMBUS DRIVER
  P:    Jean Delvare
  M:    khali@linux-fr.org
 -L:    i2c@lm-sensors.org
 +L:    linux-i2c@vger.kernel.org
  S:    Maintained
  
  VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER