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

Change-Id: I6314bc41bba5afc741d1c44481dba100ddfc9fc2