Merge "msm: display: Fix composition issues when framework rebooted in suspend."
Revert "msm: kgsl: Squashed update from msm-3.4"

 * There are still issues with the latest drivers supplied by Qualcomm,
   so rollback for now until we have a better version.

This reverts commit bd7065af2b81f138f3795c90e914d6c7374269e7.
Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.40.242' of git://codeaurora.org/kernel/msm into cm-10.1

AU_LINUX_ANDROID_JB_2.5.04.02.02.40.242 based on quic/aosp/jb_2.5