]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb33398ca106167129ebcf9c25915fbd2923fcace
tree0facf7775816261ffeeb9bb61468f9075d63cfb6
parentef43c9604ffc4735f261fc39c4fa5aa6b7752a1c
parent097f9af39d218fc06434bef690795bdccd4678f2
Merge branch 'pm-cpuidle' of git://git.kernel.org/pub/scm/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