Merge branch 'jb_2.5' of git://codeaurora.org/kernel/msm into cm-10.1

Change-Id: Ic39470801e36261a0a1d958ef2f68e6833be4ee1