Fix sources

Conflicts:
	drivers/cpufreq/Makefile

Signed-off-by: nicholaschw <nicholas.npcc@gmail.com>
cpufreq: interactive governor: apply intermediate load on current speed

Calculate intermediate speed by applyng CPU load to current speed, not
max speed.

Change-Id: Idecf598b9a203b07c989c5d9e9c6efc67a1afc2e
Signed-off-by: Todd Poynor <toddpoynor@google.com>

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
Merge the fucking Makefile
Merge branch 'android-omap3-3.0' of https://github.com/nicholaschw/lge-kernel-sniper into android-omap3-3.0