Merge remote-tracking branch 'aosp/android-3.0' into testing

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
Fix interactive govenor
Merge branch 'testing' of https://github.com/ekuler/android_kernel_samsung_crespo into testing