display: CPUFreq LCDFreq capability & state accounting

Conflicts:
	drivers/video/samsung/lcdfreq.c
lcdfreq.c: Update capability for CPU frequency based LCD freq scaling

Minor updates from Zanezam
https://github.com/zanezam/boeffla-kernel-jb-u10up-s3/commit/6fbd31c48fac134a578ad292643da9104b666fa1

Credit: AndreiLux
Revert "Derp"

This reverts commit 4c815152ad799f6c735e09e9cfa65fc76f7669f0.
Revert "mms152_ts: removing touchkeys backlight feature"

This reverts commit b8deb360c50f68ccd6a16db09b1f418b8eec9342.
Revert "minor changes touch wake and touch boost fix for N710x"

This reverts commit c286d89439edb28d84329431b742d3e4ee17a040.
Revert "touch wake and touch boost fix for N710x"

This reverts commit 67efeab0f79261abd16be5de13fb2abe0b4f55a0.
Revert "Implemented Touchboost & Touch Wake v1.11a"

This reverts commit fffa05148851b8f71d16c6a2dce69b1917b7ca8a.
Revert "Revert "Add Touchwake""

This reverts commit da43dc3dcef29d5407f02dc41a905b3661ff002a.
Revert "Add Touchwake"

This reverts commit 39131cace79917920ba539ec88dd4bcafe31eb27.

Conflicts:
	arch/arm/configs/cyanogenmod_n7100_defconfig
Revert "Fixed TouchWake on I9300"

This reverts commit 0346ce47fcfc7c61b68a7e58e0734571b1c0791f.
Touch Wake
touch_wake.c: Change delay from 45000ms to 5000ms
Touch to wake: Different infinite mode handling
- if touch wake delay is set to 0 (infinite mode), the power button will
  now also disable touch to wake (like it is for normal delays)
Touchwake v1.1
cypress-touchkey: remove backlight timeout feature

Userspace implementation:
http://review.cyanogenmod.org/48796
http://review.cyanogenmod.org/48872
http://review.cyanogenmod.org/48884

Change-Id: Id4ac50168220310e82aa4aae367dad4e72e3a9c3

Conflicts:

	drivers/input/keyboard/cypress/cypress-touchkey.c
	drivers/input/touchscreen/mms_ts.c

Conflicts:
	drivers/input/keyboard/cypress/cypress-touchkey.c
	drivers/input/touchscreen/mms_ts.c
Defconfig
Frogot these two files