From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Jun 2017 23:39:54 +0000 (+0900)
Subject: Merge tag 'usb-4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Tag: v4.12-rc6~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=19ea9d668a1f9f1e5e6752549150795a6693e6ad;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'usb-4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are some small gadget and xhci USB fixes for 4.12-rc6.

  Nothing major, but one of the gadget patches does fix a reported oops,
  and the xhci ones resolve reported problems. All have been in
  linux-next with no reported issues"

* tag 'usb-4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: gadgetfs, dummy-hcd, net2280: fix locking for callbacks
  usb: xhci: ASMedia ASM1042A chipset need shorts TX quirk
  usb: xhci: Fix USB 3.1 supported protocol parsing
  USB: gadget: fix GPF in gadgetfs
  usb: gadget: composite: make sure to reactivate function on unbind
---

19ea9d668a1f9f1e5e6752549150795a6693e6ad