git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eebef74
396e894
)
Merge branch 'sched/urgent' into sched/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 5 Aug 2010 07:46:29 +0000
(09:46 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 5 Aug 2010 07:46:29 +0000
(09:46 +0200)
Conflicts:
include/linux/sched.h
Merge reason: Add the leftover .35 urgent bits, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff