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

diff --combined MAINTAINERS
index 4afcfb4c892b76551630b3919aeed9efaedde9ed,6d7cf3b562388cd68b78880faae1723b4dd842fd..b9ea9321adde8a58722e4b3154ee50b6395d4747
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1458,17 -1458,6 +1458,6 @@@ T:     git git://github.com/kvalo/ath.gi
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
- ATHEROS ATH9K WIRELESS DRIVER
- M:    "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
- M:    Jouni Malinen <jouni@qca.qualcomm.com>
- M:    Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
- M:    Senthil Balasubramanian <senthilb@qca.qualcomm.com>
- L:    linux-wireless@vger.kernel.org
- L:    ath9k-devel@lists.ath9k.org
- W:    http://wireless.kernel.org/en/users/Drivers/ath9k
- S:    Supported
- F:    drivers/net/wireless/ath/ath9k/
- 
  WILOCITY WIL6210 WIRELESS DRIVER
  M:    Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
@@@ -2142,11 -2131,6 +2131,11 @@@ L:    linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/chipidea/
  
 +CHROME HARDWARE PLATFORM SUPPORT
 +M:    Olof Johansson <olof@lixom.net>
 +S:    Maintained
 +F:    drivers/platform/chrome/
 +
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
  M:    Sujith Sankar <ssujith@cisco.com>
@@@ -4049,12 -4033,6 +4038,12 @@@ W:    http://www.pharscape.or
  S:    Maintained
  F:    drivers/net/usb/hso.c
  
 +HSR NETWORK PROTOCOL
 +M:    Arvid Brodin <arvid.brodin@alten.se>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    net/hsr/
 +
  HTCPEN TOUCHSCREEN DRIVER
  M:    Pau Oliva Fora <pof@eslack.org>
  L:    linux-input@vger.kernel.org
@@@ -4076,7 -4054,6 +4065,7 @@@ F:      arch/x86/include/uapi/asm/hyperv.
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    drivers/hid/hid-hyperv.c
  F:    drivers/hv/
 +F:    drivers/input/serio/hyperv-keyboard.c
  F:    drivers/net/hyperv/
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/video/hyperv_fb.c
@@@ -5267,7 -5244,7 +5256,7 @@@ S:      Maintaine
  F:    Documentation/lockdep*.txt
  F:    Documentation/lockstat.txt
  F:    include/linux/lockdep.h
 -F:    kernel/lockdep*
 +F:    kernel/locking/
  
  LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
  M:    "Richard Russon (FlatCap)" <ldm@flatcap.org>
@@@ -6928,6 -6905,14 +6917,14 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/qt1010*
  
+ QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
+ M:    QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
+ L:    linux-wireless@vger.kernel.org
+ L:    ath9k-devel@lists.ath9k.org
+ W:    http://wireless.kernel.org/en/users/Drivers/ath9k
+ S:    Supported
+ F:    drivers/net/wireless/ath/ath9k/
+ 
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    ath10k@lists.infradead.org
@@@ -7391,6 -7376,7 +7388,6 @@@ S:      Maintaine
  F:    kernel/sched/
  F:    include/linux/sched.h
  F:    include/uapi/linux/sched.h
 -F:    kernel/wait.c
  F:    include/linux/wait.h
  
  SCORE ARCHITECTURE
@@@ -7526,10 -7512,9 +7523,10 @@@ SELINUX SECURITY MODUL
  M:    Stephen Smalley <sds@tycho.nsa.gov>
  M:    James Morris <james.l.morris@oracle.com>
  M:    Eric Paris <eparis@parisplace.org>
 +M:    Paul Moore <paul@paul-moore.com>
  L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
  W:    http://selinuxproject.org
 -T:    git git://git.infradead.org/users/eparis/selinux.git
 +T:    git git://git.infradead.org/users/pcmoore/selinux
  S:    Supported
  F:    include/linux/selinux*
  F:    security/selinux/
@@@ -8676,7 -8661,6 +8673,7 @@@ F:      drivers/media/usb/tm6000
  TPM DEVICE DRIVER
  M:    Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
  M:    Ashley Lai <ashley@ashleylai.com>
 +M:    Peter Huewe <peterhuewe@gmx.de>
  M:    Rajiv Andrade <mail@srajiv.net>
  W:    http://tpmdd.sourceforge.net
  M:    Marcel Selhorst <tpmdd@selhorst.net>
@@@ -9535,8 -9519,8 +9532,8 @@@ F:      drivers/xen/*swiotlb
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 +M:    Dave Chinner <dchinner@fromorbit.com>
  M:    Ben Myers <bpm@sgi.com>
 -M:    Alex Elder <elder@kernel.org>
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs