Merge branch 'tizen' into sandbox/srk/hwc

Change-Id: I97a53638430db56614bfa6647c7d57791e17a9d6
Signed-off-by: Konstantin Drabeniuk <k.drabeniuk@samsung.com>

diff --cc src/tdm.c
Simple merge

diff --cc src/tdm_layer.c
Simple merge

diff --cc src/tdm_output.c
Simple merge

diff --cc src/tdm_private.h
Simple merge