Revert "msm_serial_hs: switch back to jb_2.6"

This reverts commit cd523ecf2148d3b569ba7a109b69de786d575fd3.
Revert "Revert "underp bluetooth""

This reverts commit 4297ad69f1820df330ff701bb43994366ed6ec67.

Signed-off-by: Evan McClain <aeroevan@gmail.com>

Conflicts:
	drivers/tty/serial/msm_serial_hs.c

Change-Id: I0cb5d07b7e9556502813689040f937c6f218d8ec
Merge branch 'cm-10.2-aeroevan' of https://github.com/aeroevan/android_kernel_samsung_d2 into fender-kernel-jb-mr2