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

Change-Id: I88f2c14f25c6ea7227763c1737d4dba294a092d4