]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge 4.2-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Aug 2015 17:01:33 +0000 (10:01 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Aug 2015 17:01:33 +0000 (10:01 -0700)
We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/host/xhci-ring.c

Simple merge