diff options
| author | Greg Kroah-Hartman <[email protected]> | 2020-09-21 09:06:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2020-09-21 09:06:42 +0200 |
| commit | 629b9111535f2a2607bbea1599d285a25f32835d (patch) | |
| tree | 81a37df4e13842d5ea3d54b619e929e2b6e9ffed /net/unix/af_unix.c | |
| parent | 673d74683627bc78eaca1fdbe24b6cf45c5c8d84 (diff) | |
| parent | ba4f184e126b751d1bffad5897f263108befc780 (diff) | |
Merge 5.0-rc6 into usb-next
We want the USB fixes in here, and this resolves a merge issue in the
uas driver.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions