git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d6a65df
1824090
)
Merge branch 'linus' into tracing/hw-breakpoints
author
Ingo Molnar
<mingo@elte.hu>
Tue, 15 Sep 2009 10:18:15 +0000
(12:18 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 15 Sep 2009 10:18:15 +0000
(12:18 +0200)
Conflicts:
arch/x86/kernel/process_64.c
Semantic conflict fixed in:
arch/x86/kvm/x86.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff