From e59e0b53a028da7e730314d29541cf203795fd29 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <overx300@gmail.com>
Date: Tue, 14 Nov 2017 15:13:13 +0100
Subject: [PATCH] fix merge error

Origin commit data
------------------
Branch: master
Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b3e026fa59469230ccef392b2aa4db4d5f79fd28
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-14 (Tue, 14 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit