am df55c642: am e1e68492: Merge change Ifa58a406 into eclair

Merge commit 'df55c64203ac96fa0447357d1d19e6adee52c8d1' into eclair-mr2-plus-aosp

* commit 'df55c64203ac96fa0447357d1d19e6adee52c8d1':
  libc: kernel: Update msm_kgsl.h header