git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf82ff7
964fe08
)
Merge branch 'linus' into sched/core
author
Ingo Molnar
<mingo@elte.hu>
Sun, 25 Oct 2009 16:30:53 +0000
(17:30 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Sun, 25 Oct 2009 16:30:53 +0000
(17:30 +0100)
Conflicts:
fs/proc/array.c
Merge reason: resolve conflict and queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff