diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-06-02 00:13:02 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-06-02 00:25:31 +0200 |
| commit | 48b1fddbb100a64f3983ca9768b8ea629a09aa20 (patch) | |
| tree | 7cf552c623cb0aa0dd945df55b7eaf5a0697e277 /fs/isofs | |
| parent | x86, mce: drop "extern" from function prototypes in asm/mce.h (diff) | |
| parent | Merge branch 'x86/cpufeature' into irq/numa (diff) | |
| download | linux-48b1fddbb100a64f3983ca9768b8ea629a09aa20.tar.xz linux-48b1fddbb100a64f3983ca9768b8ea629a09aa20.zip | |
Merge branch 'irq/numa' into x86/mce3
Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.
Conflicts:
arch/x86/kernel/irqinit.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'fs/isofs')
0 files changed, 0 insertions, 0 deletions