Derp in m7 display, was mipi_jet instead of mipi_m7 ..
Merge remote-tracking branch 'htc-msm8960/3.4-caf-latest2.5' into 3.4-caf-latest2.5