git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cec5eb7
e6babb6
)
Merge branch 'x86/signal' into core/signal
author
Ingo Molnar
<mingo@elte.hu>
Tue, 23 Sep 2008 11:26:27 +0000
(13:26 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 23 Sep 2008 11:26:27 +0000
(13:26 +0200)
Conflicts:
arch/x86/kernel/cpu/feature_names.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge