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

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	mm/compaction.c
	scripts/Kbuild.include

[steven@steven676.net: fixup drivers/usb/gadget/f_adb.c after merge]
[steven@steven676.net: remove OMAP4 HDMI stuff from 3.0.y from merge]
[steven@steven676.net: remove cpufreq_interactive stuff from android-3.0 from merge]
Fix lowmemorykiller for compaction changes in 63c5442
compaction: don't give compact_nodes() static linkage

We need this to be available to the Android low memory killer.  How on
earth did this ever work in the first place?

Reported-by: David Marble <drmarble1@gmail.com>
Revert "usb: musb: fix pm_runtime mismatch"

Bisection identified this commit as causing core_pwrdm to not got to
sleep when the system suspends.  Presumably some change in the omapzoom
tree or one of our local changes adds a pm_runtime_get(), causing the
USB controller to never sleep when this patch is applied.

This reverts commit a2cb6c3022494f6e43d284ed9159e15dd71f5937.