Merge branch 'jb_2.6' of git://codeaurora.org/platform/hardware/qcom/display into cm-10.2