Merge "msm: smd_tty: Don't call del_timer() on uninitialized timers" into msm-3.4