Flags
Sweep2Wake

Conflicts:
	arch/arm/configs/ap33_android_defconfig
	drivers/net/wireless/compat-wireless_R5.SP2.03/include/linux/compat_autoconf.h
Backport ondemand
enable volume wake
enable fastcharge, thx again maxwen
Backport interactive from 3.4
GPU OC 520MHz
CPU tuning and other fixes

Conflicts:
	arch/arm/configs/ap33_android_defconfig
	drivers/cpufreq/cpufreq.c
	drivers/net/wireless/compat-wireless_R5.SP2.03/include/linux/compat_autoconf.h
	drivers/usb/gadget/f_adb.c
	drivers/usb/gadget/f_mtp.c
CONFIG update
Flag fix
Add tegra_pmqos.h
remove restoreCap

Conflicts:
	drivers/net/wireless/compat-wireless_R5.SP2.03/include/linux/compat_autoconf.h
It survived...until now.
Remove conflicting tracepoints
...and the including
gcc fix
cpufreq changes