Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

diff --combined MAINTAINERS
index cb389067cf66959b9c9516676c03056253cdcb3d,96ddac7c21bc918cdc1f21bba32cb119f7fac9b2..eaa46594f0211a4abdb420e9abb758c2ad95f26b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -116,6 -116,12 +116,12 @@@ M:       ajk@iehk.rwth-aachen.d
  L:    linux-hams@vger.kernel.org
  S:    Maintained
  
+ YEALINK PHONE DRIVER
+ P:    Henk Vergonet
+ M:    Henk.Vergonet@gmail.com
+ L:    usbb2k-api-dev@nongnu.org
+ S:    Maintained
+ 
  8139CP 10/100 FAST ETHERNET DRIVER
  P:    Jeff Garzik
  M:    jgarzik@pobox.com
@@@ -1813,6 -1819,13 +1819,6 @@@ M:     hch@infradead.or
  L:    linux-abi-devel@lists.sourceforge.net
  S:    Maintained
  
 -PCI ID DATABASE
 -P:    Martin Mares
 -M:    mj@ucw.cz
 -L:    pciids-devel@lists.sourceforge.net
 -W:    http://pciids.sourceforge.net/
 -S:    Maintained
 -
  PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
  P:    Thomas Sailer
  M:    sailer@ife.ee.ethz.ch