From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 21 Nov 2014 15:31:42 +0000 (+0100)
Subject: Merge back earlier cpuidle material for 3.19-rc1.
X-Git-Tag: omap-for-v3.19/fixes-rc1~136^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a924200ae5fcf7b3d237d92a110545b6db6aa18;p=pandora-kernel.git

Merge back earlier cpuidle material for 3.19-rc1.

Conflicts:
	drivers/cpuidle/dt_idle_states.c
---

0a924200ae5fcf7b3d237d92a110545b6db6aa18
Reading git-diff-tree failed