git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3ddeb51
cf3997f
)
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc...
author
Ingo Molnar
<mingo@elte.hu>
Tue, 27 Jan 2009 11:03:24 +0000
(12:03 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 27 Jan 2009 11:03:24 +0000
(12:03 +0100)
Conflicts:
arch/x86/kernel/setup_percpu.c
Semantic conflict:
arch/x86/kernel/cpu/common.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff