diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-28 21:42:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-28 21:42:36 +0100 |
| commit | ca9400ef7f6793288db95ca658dede6e71e777d6 (patch) | |
| tree | 5e935bb2713f47d782ea75800e889729d3cbc0ee /include/linux/timerqueue.h | |
| parent | USB: core: Update kerneldoc for usb_get_dev() and usb_get_intf() (diff) | |
| parent | Linux 5.17-rc6 (diff) | |
Merge 5.17-rc6 into usb-next
We need the USB fixes in here, and it resolves a merge conflict in:
drivers/usb/dwc3/dwc3-pci.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions