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

Commit 376563a5 authored by Udaya Bhaskara Reddy Mallavarapu's avatar Udaya Bhaskara Reddy Mallavarapu Committed by Gerrit - the friendly Code Review server
Browse files

media: dvb-core: Fix for dvb_ringbuffer merge conflict 



resolve the dvb_ringbuffer merge conflicts due to
v4.4-16.09-android-tmp branch merging.

Change-Id: Ic5ec87d48e86fd9504fed7232286cf81b46c4035
Signed-off-by: default avatarUdaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
parent 97057b5e
Show 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