Merge "diag: Add diag changes to bring diag up to date"
Conflicts:
	drivers/char/diag/diag_dci.c
	drivers/char/diag/diag_debugfs.c
	drivers/char/diag/diag_masks.c
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagfwd.c
	drivers/char/diag/diagfwd_cntl.c
msm:vidc: Add support for MP2 sequence end code

ISDB-T client requires end of sequence notification
in the flags of the output buffer when sequence end
code is queued to the video core. Add support by reading
from video core shared memory and update the output buffer
flags for MPEG-2 codec.

Change-Id: Idd88fc6a5cdccb41fa61ba902a0014ec8359739a
Signed-off-by: Rajeshwar Kurapaty <rkurapat@codeaurora.org>

Conflicts:
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h
Merge "tty: n_smux: Enable IPC logging for SMUX"
Conflicts:
	drivers/tty/n_smux.c
Merge "n_smux: add debugfs node for printing channel states"
Merge "tty: n_smux: Add flow control state to overflow message"
Merge "tty: n_smux: Log error messages to internal log"
Merge "tty: n_smux: Add function to determine if remote side is active"