| commit | cd0e075784f4bce97b4ed47d4b354f045e895546 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 23 21:49:37 2015 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 23 21:49:37 2015 +0100 |
| tree | 2354d4c2f5185c59dc21c537841b55c694cc53ec | |
| parent | 32fc9eb5b2dcebefb7fb4c8288c739c320362524 [diff] | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 [diff] |
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 <gregkh@linuxfoundation.org>