backport CPUIDLE from 3.5

Conflicts:

	drivers/cpufreq/cpufreq_wheatley.c

Change-Id: Ifd9d772d832e28917a46683d72ffb4e6628a592c