Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...

diff --combined MAINTAINERS
index 4c5e9fe0f7db5cd80b3fe2c4a76d38a3df1d7fcc,2676f9a1feeefc611d0c43ad326d90c881b4da36..e7b68c22f1f263cd6885a3d0df9a7278d4f543eb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -936,94 -936,19 +936,19 @@@ M:      joern@lazybastard.or
  L:    linux-mtd@lists.infradead.org
  S:    Maintained
  
- BLUETOOTH SUBSYSTEM
+ BLUETOOTH DRIVERS
  P:    Marcel Holtmann
  M:    marcel@holtmann.org
- P:    Maxim Krasnyansky
- M:    maxk@qualcomm.com
  L:    linux-bluetooth@vger.kernel.org
- W:    http://bluez.sf.net
- W:    http://www.bluez.org
- W:    http://www.holtmann.org/linux/bluetooth/
- T:    git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
- S:    Maintained
- 
- BLUETOOTH RFCOMM LAYER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- P:    Maxim Krasnyansky
- M:    maxk@qualcomm.com
- S:    Maintained
- 
- BLUETOOTH BNEP LAYER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- P:    Maxim Krasnyansky
- M:    maxk@qualcomm.com
- S:    Maintained
- 
- BLUETOOTH CMTP LAYER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
+ W:    http://www.bluez.org/
  S:    Maintained
  
- BLUETOOTH HIDP LAYER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- S:    Maintained
- 
- BLUETOOTH HCI UART DRIVER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- P:    Maxim Krasnyansky
- M:    maxk@qualcomm.com
- S:    Maintained
- 
- BLUETOOTH HCI USB DRIVER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- P:    Maxim Krasnyansky
- M:    maxk@qualcomm.com
- S:    Maintained
- 
- BLUETOOTH HCI BCM203X DRIVER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- S:    Maintained
- 
- BLUETOOTH HCI BPA10X DRIVER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- S:    Maintained
- 
- BLUETOOTH HCI BFUSB DRIVER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- S:    Maintained
- 
- BLUETOOTH HCI DTL1 DRIVER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- S:    Maintained
- 
- BLUETOOTH HCI BLUECARD DRIVER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- S:    Maintained
- 
- BLUETOOTH HCI BT3C DRIVER
- P:    Marcel Holtmann
- M:    marcel@holtmann.org
- S:    Maintained
- 
- BLUETOOTH HCI BTUART DRIVER
+ BLUETOOTH SUBSYSTEM
  P:    Marcel Holtmann
  M:    marcel@holtmann.org
- S:    Maintained
- 
- BLUETOOTH HCI VHCI DRIVER
- P:    Maxim Krasnyansky
- M:    maxk@qualcomm.com
+ L:    linux-bluetooth@vger.kernel.org
+ W:    http://www.bluez.org/
+ T:    git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
  S:    Maintained
  
  BONDING DRIVER
@@@ -2928,12 -2853,6 +2853,12 @@@ M:    jirislaby@gmail.co
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
 +MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 +P:     Felipe Balbi
 +M:     felipe.balbi@nokia.com
 +L:     linux-usb@vger.kernel.org
 +S:     Maintained
 +
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  P:    Andrew Gallatin
  M:    gallatin@myri.com
@@@ -3082,7 -3001,6 +3007,7 @@@ M:      horms@verge.net.a
  P:    Julian Anastasov
  M:    ja@ssi.bg
  L:    netdev@vger.kernel.org
 +L:    lvs-devel@vger.kernel.org
  S:    Maintained
  
  NFS, SUNRPC, AND LOCKD CLIENTS
@@@ -4202,6 -4120,12 +4127,6 @@@ M:     oliver@neukum.nam
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  
 -USB AUERSWALD DRIVER
 -P:    Wolfgang Muees
 -M:    wolfgang@iksw-muees.de
 -L:      linux-usb@vger.kernel.org
 -S:    Maintained
 -
  USB BLOCK DRIVER (UB ub)
  P:    Pete Zaitcev
  M:    zaitcev@redhat.com