git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a9de18e
99937d6
)
Merge branch 'core/percpu' into stackprotector
author
Ingo Molnar
<mingo@elte.hu>
Sun, 18 Jan 2009 17:37:14 +0000
(18:37 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Sun, 18 Jan 2009 17:37:14 +0000
(18:37 +0100)
Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff