Merge changes Ic0dedbad,Ic0dedbad into msm-3.4

* changes:
  msm: kgsl: Allow the wait_timeout to be disabled
  msm: kgsl: Don't use 'wait_timeout' in the idle functions