Merge branch 'cm-10.2' into martincz

Fix merge

merge CyanogenMod

Merge remote-tracking branch 'gh/ics' into cm-10.1

optimized (I hope) defconfig file

commented out no longer needed printks

and one more file modified for uv

different way of protecting phone from going to deepsleep on calls. Needs some serious testing

some more preparations for kernel undervolting

some delays tweaks since it might be too short for panel to wake up properly sometimes

some cleaning

initial undervolting support

speed up wakeup process

temporary solution for proximity sensor issue on cm9

deferred resume only for ext sdcard