cleanup and fix

Conflicts:
	arch/arm/mach-tegra/tegra3_dvfs.c
	arch/arm/mach-tegra/tegra_mpdecision.c
	drivers/net/wireless/compat-wireless_R5.SP2.03/include/linux/compat_autoconf.h