Skip to content
Commit c4aa8b2a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.20-rc6 into char-misc-next 



This should resolve the hv driver merge conflict.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 48d365de 40e020c1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment