Merge 4.6-rc5 into usb-next
authorGreg Kroah-Hartman <[email protected]>
Mon, 25 Apr 2016 17:50:11 +0000 (10:50 -0700)
committerGreg Kroah-Hartman <[email protected]>
Mon, 25 Apr 2016 17:50:11 +0000 (10:50 -0700)
We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

Trivial merge