Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge 4.6-rc7 into char-misc-testing 



This resolves a merge issue with drivers/hv/ring_buffer.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 8cd1f9d0 44549e8f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment