git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2aaf8f
6a94cb7
)
Merge branch 'linus' into stackprotector
author
Ingo Molnar
<mingo@elte.hu>
Wed, 31 Dec 2008 07:31:57 +0000
(08:31 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 31 Dec 2008 07:31:57 +0000
(08:31 +0100)
Conflicts:
arch/x86/include/asm/pda.h
kernel/fork.c
Trivial merge