diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:17:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:17:08 +0200 |
| commit | 4b62ac9a2b859f932afd5625362c927111b7dd9b (patch) | |
| tree | 30b159e2a0ffa635488feae5587640a7c21372f3 /arch/arm/mach-ixp4xx | |
| parent | 2b4fa851b2f06fdb04cac808b57324f5e51e1578 (diff) | |
| parent | 8700600a74852d75eb965b969dcf9f58e2b32546 (diff) | |
Merge branch 'x86/nmi' into x86/devel
Conflicts:
arch/x86/kernel/nmi.c
arch/x86/kernel/nmi_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
0 files changed, 0 insertions, 0 deletions