Merge branch 'features/brillcodec_2i' into 'tizen_next'
Conflicts:
configure
package/changelog
package/pkginfo.manifest
target-i386/hax-all.c
tizen/src/Makefile
tizen/src/display/maru_display.c
tizen/src/display/maru_sdl.c
tizen/src/display/maru_shm.c
tizen/src/display/maru_shm.h
tizen/src/eventcast/encode_fb.c
tizen/src/eventcast/encode_fb.h
tizen/src/eventcast/touch.c
tizen/src/eventcast/touch.h
tizen/src/hw/pci/Makefile.objs
tizen/src/hw/pci/maru_brillcodec.c
tizen/src/hw/pci/maru_brillcodec.h
tizen/src/hw/pci/maru_brillcodec_device.c
tizen/src/tethering/Makefile.objs
tizen/src/tethering/common.c
tizen/src/util/new_debug_ch.c
tizen/src/util/osutil.h
vl.c
Change-Id: Iab1486003ec796882e52647d08518624db664cdc