| commit | c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Dec 10 09:22:34 2018 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Dec 10 09:22:34 2018 +0100 |
| tree | d04a7861e542665bb7c03aac729a72c957be8abc | |
| parent | 48d365de7746a000afd7f9f7cc1821cbb6fe9b45 [diff] | |
| parent | 40e020c129cfc991e8ab4736d2665351ffd1468d [diff] |
Merge 4.20-rc6 into char-misc-next This should resolve the hv driver merge conflict. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>