Merge "msm: smd_tty: add new channels for userspace access" into msm-3.0