git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6852fd9
4480f15
)
Merge branch 'linus' into oprofile-v2
author
Ingo Molnar
<mingo@elte.hu>
Mon, 13 Oct 2008 09:05:51 +0000
(11:05 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 13 Oct 2008 09:05:51 +0000
(11:05 +0200)
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff