diff options
| author | Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org> | 2017-01-05 10:49:50 +0530 |
|---|---|---|
| committer | Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org> | 2017-01-05 11:25:26 +0530 |
| commit | 15d83b644a8249a0f59fa07fef42d6b6cf2798ce (patch) | |
| tree | 6192b3d4065aafa8e6e3fcc0b034bb6ff1ba4875 /include/linux/timerqueue.h | |
| parent | 8bb66a7e413624884e697d295b7e136f96209cd9 (diff) | |
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.
CRs-Fixed: 1086706
Change-Id: Ic5ec87d48e86fd9504fed7232286cf81b46c4035
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions