cpuidle backport from linux v3.2rc1

Conflicts:
	include/linux/cpuidle.h

Signed-off-by: Humberto Borba <humberos@gmail.com>