Merge changes I2f51f692,Ibecf6cea into msm-3.0

* changes:
  n_smux: smux_ctl: Userspace character device interface for SMUX
  tty: n_smux: Add SMUX TTY Line Discipline Driver