From: Linus Torvalds Date: Fri, 26 Aug 2011 20:10:06 +0000 (-0700) Subject: Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... X-Git-Tag: MMI-PSA29.97-13-9~18472 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3.1.0-rc3-00270-g7a54f5e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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: (30 commits) USB: ftdi_sio: add Calao reference board support USB option driver K3765/K4505 avoid CDC_DATA interface USB: option: add YUGA device id to driver usb: s5p-ehci: fix a NULL pointer deference USB: EHCI: Do not rely on PORT_SUSPEND to stop USB resuming in ehci_bus_resume(). USB option driver add PID of Huawei Vodafone K4605 USB option driver add PID of Huawei Vodafone K3806 xhci: Handle zero-length isochronous packets. USB: Avoid NULL pointer deref in usb_hcd_alloc_bandwidth. usb: musb: gadget: fix error path usb: gadget: f_phonet: unlock in error case usb: musb: blackfin: include prefetch head file usb: musb: tusb6010: fix compilation usb: gadget: renesas_usbhs: fix DMA build by including dma-mapping.h usb: musb: cppi: fix build errors due to DBG and missing musb variable usb: musb: ux500: replace missing DBG with dev_dbg usb: musb: ux500: set dma config for both src and dst usb: musb: fix oops on musb_gadget_pullup usb: host: ehci-omap: fix .remove and failure handling path of .probe(v1) usb: gadget: hid: don't STALL when processing a HID Descriptor request ... --- 7a54f5e19f90342340112939ef592fff20fc370c