diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:32:17 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:32:17 (GMT) |
| commit | 206855c321adee56db3946ca09a5887cddb9d598 (patch) | |
| tree | 13a2729d4d0e37170552bd9ad3c6bba71ba0c55c /include/linux/nmi.h | |
| parent | e8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508 (diff) | |
| parent | cb58ffc3889f0545628f138f849e759a331b8ddc (diff) | |
| download | linux-fsl-qoriq-206855c321adee56db3946ca09a5887cddb9d598.tar.xz | |
Merge branch 'x86/urgent' into core/signal
Conflicts:
arch/x86/kernel/signal_64.c
Diffstat (limited to 'include/linux/nmi.h')
0 files changed, 0 insertions, 0 deletions