From: Greg Kroah-Hartman Date: Mon, 23 Mar 2015 20:49:37 +0000 (+0100) Subject: Merge 4.0-rc5 into usb-next X-Git-Tag: v4.1-rc1~154^2~56 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cd0e075784f4bce97b4ed47d4b354f045e895546;p=users%2Fgriffoul%2Flinux.git Merge 4.0-rc5 into usb-next We want the USB fixes in here as well to resolve merge conflicts. Signed-off-by: Greg Kroah-Hartman --- cd0e075784f4bce97b4ed47d4b354f045e895546