Merge "msm: ipc: Do not load any subsystem by default"
Conflicts:
	arch/arm/mach-msm/ipc_socket.c
Merge "msm: ipc: Load default subsystem under appropriate scenario"
msm: camera: Added the NULL pointer check

Added the NULL pointer check for isp_config
to avoid the crashes

Change-Id: I2df7eeb5c633b04c3aac5d985cf50c2ece7f1076
CRs-Fixed: 495652
Signed-off-by: manish gotefode <mgote@codeaurora.org>
tty: smux_ctl: Add new SMUX port Support

smux_ctl exposes only one control port to userspace. Enabling of dual
PDN support requires two SMUX ports.

Add new SMUX control port to enable dual PDN support.

CRs-Fixed: 497343
Change-Id: I2a1d48f1e5d2acd1f67d7673d325c4360b783cf4
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
rmnet_smux: Increase Rmnet device instance count

Rmnet supports only one device instance.

Increase Rmnet device instance count to enable dual PDN support.

CRs-Fixed: 497343
Change-Id: I1b3eacec4404ac72a524380a1fff39e6b257ade8
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
Merge "msm_fb: hdmi: Return proper clock get error code"
msm: camera: Return from DQBUF ioctl in case of error.

Incase the vb2_dqbuf call returns error, we are continuing
ahead and trying to access the fields of the vb2 buffer which
may not be initialized yet. Avoid this by checking the
return value of vb2_dqbuf and return immediately in case of
errors.

Change-Id: I33036fe9b3bd7ce2b28e9cd6e4cd5f293425be95
CRs-Fixed: 495635
Signed-off-by: Kiran Kumar H N <hurlisal@codeaurora.org>
devices-8960: Fix camera failure with newer tz firmware

Change-Id: I524ff7196d9f3ae268178826b986d5dcee1de88f