diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-11 18:23:20 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 18:23:20 (GMT) |
| commit | 0afe2db21394820d32646a695eccf3fbfe6ab5c7 (patch) | |
| tree | 6d925383f444a242ebc77d167420efb7e6ad8d99 /include/linux/irq.h | |
| parent | d84705969f898f294bc3fc32eca33580f14105bd (diff) | |
| parent | 43603c8df97f246e8be7b9cc92a8f968a85108bd (diff) | |
| download | linux-fsl-qoriq-0afe2db21394820d32646a695eccf3fbfe6ab5c7.tar.xz | |
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/linux/irq.h')
0 files changed, 0 insertions, 0 deletions