From: Linus Torvalds Date: Tue, 22 May 2012 00:40:42 +0000 (-0700) Subject: Merge branch 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: Ubuntu-5.2.0-15.16~18039 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ba01a87e37d3ca9efe141e2907c2ec3f89490b4f;p=mirror_ubuntu-eoan-kernel.git Merge branch 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending Pull usb-gadget scsi-target merge from Nicholas Bellinger: "As promised, here is the pull request for Sebastian's usb-gadget target UASP / BOT driver for v3.5-rc1. This code has been in linux-next for a number of weeks, and is now ready for an initial merge. This fabric uses the target framework to provide a usb gadget device. This gadget supports the USB Attached SCSI Protocol (UASP) and Bulk Only Transfers (BOT or BBB). BOT is the primary interface, UAS is the alternative interface. Note this series is dependent upon a single target core patch for adding se_cmd->unknown_data_length in target-pending/for-next, that got merged in the parent. Kudos to Sebastian for making this driver happen so easily, and for his patches to improve usb-core and target core along the way to his goal. Also thanks to Felipe + Greg-KH for their help in getting this driver ready for mainline." * 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: usb-gadget: Initial merge of target module for UASP + BOT --- ba01a87e37d3ca9efe141e2907c2ec3f89490b4f