Merge branch 'pm-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 08:37:06 +0000 (10:37 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 08:37:06 +0000 (10:37 +0200)
commitec6e7f4082aa0c6c4334149e74673b6ed736fb63
tree0facf7775816261ffeeb9bb61468f9075d63cfb6
parent65c2ce70046c779974af8b5dfc25a0df489089b5
parenta6220fc19afc07fe77cfd16f5b8e568615517091
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>
kernel/sched/idle.c