diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 09:29:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 09:29:13 +0200 |
| commit | 7844b8927e78bfb060ba88c36c99d3e07c3fb631 (patch) | |
| tree | 9992206cd2beb8de57d90ac3691cf670ddd15222 | |
| parent | 545feeff158e03318bfaf34d0877da7ebfea3540 (diff) | |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
Merge 4.6-rc7 into usb-next
We want the USB fixes in here to resolve merge issues and make it easier
for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>