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

This reverts commit fea13d78db87a4af70c0aa6f0c231f87ba1485ef.