git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
65c2ce7
a6220fc
)
Merge branch 'pm-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
author
Ingo Molnar
<mingo@kernel.org>
Thu, 22 May 2014 08:37:06 +0000
(10:37 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Thu, 22 May 2014 08:37:06 +0000
(10:37 +0200)
Pull scheduling related CPU idle updates from Rafael J. Wysocki.
Conflicts:
kernel/sched/idle.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge