Merge Branch JB_2.6 of msm kernel
Reverted GPU part from it to keep in sync with CM