Merge branch 'cm-10.2' of bitbucket.org:AriesVE-DevCon-Team/samsung-kernel-msm7x30 into cm-10.2_gcc4.8
Squashed update of kernel from 3.4.66 to 3.4.67
gp2a_proximity: readded wakelock is necessary to avoid problems with answer calls
and some cleanups
Merge branch 'cm-10.2' of bitbucket.org:AriesVE-DevCon-Team/samsung-kernel-msm7x30 into cm-10.2_gcc4.8
Update custom config
Squashed update of kernel from 3.4.67 to 3.4.68
msm: kgsl: Avoid turning on GPU clock if already off

In adreno_idle(), check if the GPU clock is already
turned off. If so, the GPU is already idle,
so don't turn on the clocks again.

Change-Id: I27ae939253ee71830466e3117bed0230d7ff67d5
Signed-off-by: Ananta Kishore K <akollipa@codeaurora.org>
Merge branch 'cm-10.2' of bitbucket.org:AriesVE-DevCon-Team/samsung-kernel-msm7x30 into cm-10.2_gcc4.8
Merge branch 'cm-10.2_gcc4.8' of bitbucket.org:erik96/samsung-kernel-msm7x30 into cm-10.2