git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
81444a7
d65bd5e
)
Merge branch 'sched/core' into cpus4096
author
Ingo Molnar
<mingo@elte.hu>
Fri, 12 Dec 2008 12:48:57 +0000
(13:48 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 12 Dec 2008 12:48:57 +0000
(13:48 +0100)
Conflicts:
include/linux/ftrace.h
kernel/sched.c
Trivial merge