am 65312005: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '65312005a889ad73f2e55af2b6948b30503a1aa6':
  kernel-headers: update msm_mdp.h original header