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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (122 commits)
  USB: mos7840: add device IDs for B&B electronics devices
  USB: ftdi_sio: add USB device ID's for B&B Electronics line
  USB: musb: musb_host: fix sparse warning
  USB: musb: musb_gadget: fix sparse warning
  USB: musb: omap2430: fix sparse warning
  USB: core: message: fix sparse warning
  USB: core: hub: fix sparse warning
  USB: core: fix sparse warning for static function
  USB: Added USB_ETH_RNDIS to use instead of CONFIG_USB_ETH_RNDIS
  USB: Check bandwidth when switching alt settings.
  USB: Refactor code to find alternate interface settings.
  USB: xhci: Fix command completion after a drop endpoint.
  USB: xhci: Make reverting an alt setting "unfailable".
  USB: usbtmc: Use usb_clear_halt() instead of custom code.
  USB: xhci: Add correct email and files to MAINTAINERS entry.
  USB: ehci-omap.c: introduce missing kfree
  USB: xhci-mem.c: introduce missing kfree
  USB: add remove_id sysfs attr for usb drivers
  USB: g_multi kconfig: fix depends and help text
  USB: option: add pid for ZTE
  ...

diff --combined MAINTAINERS
index 98d5ca1,a383281..520a3b3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3903,23 -3903,6 +3903,23 @@@ L:    linux-omap@vger.kernel.or
  S:    Maintained
  F:    drivers/video/omap/
  
 +OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2)
 +M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
 +L:    linux-omap@vger.kernel.org
 +L:    linux-fbdev@vger.kernel.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/video/omap2/dss/
 +F:    drivers/video/omap2/vrfb.c
 +F:    drivers/video/omap2/vram.c
 +F:    Documentation/arm/OMAP/DSS
 +
 +OMAP FRAMEBUFFER SUPPORT (FOR DSS2)
 +M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
 +L:    linux-omap@vger.kernel.org
 +L:    linux-fbdev@vger.kernel.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/video/omap2/omapfb/
 +
  OMAP MMC SUPPORT
  M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
  L:    linux-omap@vger.kernel.org
@@@ -5680,9 -5663,11 +5680,11 @@@ S:    Maintaine
  F:    drivers/net/wireless/rndis_wlan.c
  
  USB XHCI DRIVER
- M:    Sarah Sharp <sarah.a.sharp@intel.com>
+ M:    Sarah Sharp <sarah.a.sharp@linux.intel.com>
  L:    linux-usb@vger.kernel.org
  S:    Supported
+ F:    drivers/usb/host/xhci*
+ F:    drivers/usb/host/pci-quirks*
  
  USB ZC0301 DRIVER
  M:    Luca Risolia <luca.risolia@studio.unibo.it>