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
  ...

1 files changed, 3 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 98d5ca10ac04..520a3b3fd82c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5680,9 +5680,11 @@ S:	Maintained
 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>