git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2b583d8
3c92ec8
)
Merge branch 'linus' into perfcounters/core
author
Ingo Molnar
<mingo@elte.hu>
Mon, 29 Dec 2008 08:45:15 +0000
(09:45 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 29 Dec 2008 08:45:15 +0000
(09:45 +0100)
Conflicts:
fs/exec.c
include/linux/init_task.h
Simple context conflicts.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff