Merge 4.6-rc5 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2016-04-25 10:50:11 -07:00
commit 69b4269eff
8 changed files with 265 additions and 49 deletions