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