From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 22 May 2014 08:37:06 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~33^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec6e7f4082aa0c6c4334149e74673b6ed736fb63;p=pandora-kernel.git

Merge branch 'pm-cpuidle' of git://git./linux/kernel/git/rafael/linux-pm into sched/core

Pull scheduling related CPU idle updates from Rafael J. Wysocki.

Conflicts:
	kernel/sched/idle.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

ec6e7f4082aa0c6c4334149e74673b6ed736fb63
Reading git-diff-tree failed