smdk4412: i9300 update 11

Change-Id: I1a3f2a384c6ead81018704a02330fe46df849777
cpufreq_conservative: Improve support for micro idle accounting

The minimum samplerate calculations of the current conservative
implementation assume that there is not micro idle accounting present,
however, we do have that capability in our idle estimates.  As a result,
we can support lower polling intervals just like ondemand does.

Change-Id: I134027f28abd8e76ee8212685572272b1ddaa872
Signed-off-by: Andrew Dodd <atd7@cornell.edu>
Merge "smdk4412: i9300 update 11" into android-4.4
smdk4412: Touchwake: Final tuning for s3

Change-Id: Id4c21ac297c935390e77ff23bb10208a198d2749
Merge "cpufreq_conservative: Improve support for micro idle accounting" into android-4.4
Merge remote-tracking branch 'omni/android-4.4' into omni-android-4.4

Conflicts:
	drivers/video/fbmem.c
	kernel/signal.c