Merge branch 'omap3-android-3.0.y' into encore-omap3-3

Conflicts:
	Documentation/cpu-freq/governors.txt
	drivers/cpufreq/cpufreq_interactive.c
	include/trace/events/cpufreq_interactive.h
	mm/compaction.c
	scripts/Kbuild.include
Fix lowmemorykiller for compaction changes in 63c5442