git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4f962d4
278429c
)
Merge branch 'linus' into stackprotector
author
Ingo Molnar
<mingo@elte.hu>
Wed, 15 Oct 2008 11:46:29 +0000
(13:46 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 15 Oct 2008 11:46:29 +0000
(13:46 +0200)
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff