cpuidle: upstream 3.4 compatible

Conflicts:
	arch/arm/mach-tegra/cpuidle.c
	drivers/cpuidle/cpuidle.c