p500: Fix proximity sensor (thanks cyrix.vs)

Fixes blackscreen when call received

Conflicts:

	drivers/input/sensor/Makefile

Change-Id: If0a043266cf07f5ee77bb5558d80b88ebee35f26
acpuclock: OC stability fixes

Change-Id: I6252b195da4d60a6e146e94e036c3d32e84d3ea4
Signed-off-by: Randolf Kastenmaier <randolf.kastenmaier@gmail.com>
Merge branch 'cm-10.1' of https://github.com/androidarmv6/android_kernel_lge_msm7x27-3.0.x into cm-10.1