diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 08:39:54 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 08:39:54 +0900 |
| commit | 19ea9d668a1f9f1e5e6752549150795a6693e6ad (patch) | |
| tree | bb621fb9e2c91291c69895018d47a938639b9ddb /net/ipv6/ip6_gre.c | |
| parent | 1be627dfa74d9eee1eca1bc48653e461366a2bb9 (diff) | |
| parent | f16443a034c7aa359ddf6f0f9bc40d01ca31faea (diff) | |
| download | linux-19ea9d668a1f9f1e5e6752549150795a6693e6ad.tar.gz linux-19ea9d668a1f9f1e5e6752549150795a6693e6ad.tar.bz2 linux-19ea9d668a1f9f1e5e6752549150795a6693e6ad.zip | |
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
Diffstat (limited to 'net/ipv6/ip6_gre.c')
0 files changed, 0 insertions, 0 deletions