From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Nov 2010 01:13:28 +0000 (-0800)
Subject: Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v2.6.37-rc2~23
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=00dad7fa99701f5ca83b9f598d1c36c9523bbbf7;hp=-c

Merge branch 'usb-linus' of git://git./linux/kernel/git/gregkh/usb-2.6

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (28 commits)
  Revert "USB: xhci: Use GFP_ATOMIC under spin_lock"
  USB: ohci-jz4740: Fix spelling in MODULE_ALIAS
  UWB: Return UWB_RSV_ALLOC_NOT_FOUND rather than crashing on NULL dereference if kzalloc fails
  usb: core: fix information leak to userland
  usb: misc: iowarrior: fix information leak to userland
  usb: misc: sisusbvga: fix information leak to userland
  usb: subtle increased memory usage in u_serial
  USB: option: fix when the driver is loaded incorrectly for some Huawei devices.
  USB: xhci: Use GFP_ATOMIC under spin_lock
  usb: gadget: goku_udc: add registered flag bit, fixing build
  USB: ehci/mxc: compile fix
  USB: Fix FSL USB driver on non Open Firmware systems
  USB: the development of the usb tree is now in git
  usb: musb: fail unaligned DMA transfers on v1.8 and above
  USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial
  usb.h: fix ioctl kernel-doc info
  usb: musb: gadget: kill duplicate code in musb_gadget_queue()
  usb: musb: Fix handling of spurious SESSREQ
  usb: musb: fix kernel oops when loading musb_hdrc module for the 2nd time
  USB: musb: blackfin: push clkin value to platform resources
  ...
---

00dad7fa99701f5ca83b9f598d1c36c9523bbbf7
diff --combined MAINTAINERS
index 716c548107dd,5213f1f83ecc..1b1954dc087d
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -161,7 -161,7 +161,7 @@@ M:	Greg Kroah-Hartman <gregkh@suse.de
  L:	linux-serial@vger.kernel.org
  W:	http://serial.sourceforge.net
  S:	Maintained
 -T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
  F:	drivers/serial/8250*
  F:	include/linux/serial_8250.h
  
@@@ -5910,7 -5910,7 +5910,7 @@@ S:	Maintaine
  TTY LAYER
  M:	Greg Kroah-Hartman <gregkh@suse.de>
  S:	Maintained
 -T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
  F:	drivers/char/tty_*
  F:	drivers/serial/serial_core.c
  F:	include/linux/serial_core.h
@@@ -6233,7 -6233,7 +6233,7 @@@ USB SUBSYSTE
  M:	Greg Kroah-Hartman <gregkh@suse.de>
  L:	linux-usb@vger.kernel.org
  W:	http://www.linux-usb.org
- T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
  S:	Supported
  F:	Documentation/usb/
  F:	drivers/net/usb/
@@@ -6598,14 -6598,14 +6598,14 @@@ F:	drivers/platform/x8
  
  XEN PCI SUBSYSTEM
  M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:	xen-devel@lists.xensource.com
 +L:	xen-devel@lists.xensource.com (moderated for non-subscribers)
  S:	Supported
  F:	arch/x86/pci/*xen*
  F:	drivers/pci/*xen*
  
  XEN SWIOTLB SUBSYSTEM
  M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:	xen-devel@lists.xensource.com
 +L:	xen-devel@lists.xensource.com (moderated for non-subscribers)
  S:	Supported
  F:	arch/x86/xen/*swiotlb*
  F:	drivers/xen/*swiotlb*
@@@ -6613,7 -6613,7 +6613,7 @@@
  XEN HYPERVISOR INTERFACE
  M:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:	xen-devel@lists.xen.org
 +L:	xen-devel@lists.xensource.com (moderated for non-subscribers)
  L:	virtualization@lists.osdl.org
  S:	Supported
  F:	arch/x86/xen/