Fixups for sscan
Revert "Revert "Add support for Flar2's MSM_SLEEPER (max screen off frequency). Add it to Aroma as well with presets.""

This reverts commit 1d2bf4b188c17f915215077ed22e70dd8e6cae42.

Conflicts:
	Makefile
Revert "Revert "Fix MSM-Sleeper""

This reverts commit 3a36e530bd452260ef44db2cd970e89e7dbbb262.
Revert "Revert "More sleeper fixes""

This reverts commit 2d1f2a5b362f6196ec9913abcedd58ee75c96960.
Revert "Revert "Scroff""

This reverts commit 86dc0cab18ee9cf9437fe3eb528853f6e54c0281.
Revert "Mkfile fix"

This reverts commit 19eb162695e88cfc77cbe6be473638b7eed519df.
Revert "softirq: Use hotplug thread infrastructure"

This reverts commit 007720892a862692cf666a7e5fb520e1fbb4d735.
Revert "kernel/futex.c: Linux 3.4 compatibility fix up"

This reverts commit 232f10573030ab3f2af4c5c40b2d804bed437055.
Revert "msm: kgsl: don't use sscanf()"

This reverts commit dbbfaeb15aa6fb74cf29d44553ecc89106823cb8.