diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:19:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:19:32 +0200 |
| commit | e47ff590cc57a3468c1f77e5f2494bbaefdd4371 (patch) | |
| tree | 7c71b3832c0d805b0ee6daa1aaaa50326b65654f /drivers/net/ethernet/toshiba | |
| parent | 2e58cafa0bbde529a9f44300382f60f6ce46d7d2 (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
Merge 4.11-rc4 into usb-next
This resolves a merge issue in the gadget code, and we want the USB
fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/toshiba')
0 files changed, 0 insertions, 0 deletions