| commit | 01f1918833e4817fdb0810306c021c5cbee775d3 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Jan 02 15:13:41 2018 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Jan 02 15:13:41 2018 +0100 |
| tree | 34a649c453d30fee1f1b564badb6e3dc210655c3 | |
| parent | 3df613ec12f71f00dad545a9df75573951e5c59f [diff] | |
| parent | 30a7acd573899fd8b8ac39236eff6468b195ac7d [diff] |
Merge 4.15.0-rc6 into usb-next We want the USB fixes in here, and this resolves a merge issue with the vhci_rx.c file. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>