summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-14 15:13:47 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-14 15:13:47 +0200
commit881b374705f352725ba1f558968ef34c17ba900e (patch)
treed7286c00d109db65662af1435fe3b5c8868814d2 /arch/um
parentMerge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core (diff)
parentx86: apic unification - merge down enable_NMI_through_LVT0 (diff)
downloadlinux-881b374705f352725ba1f558968ef34c17ba900e.tar.xz
linux-881b374705f352725ba1f558968ef34c17ba900e.zip
Merge branch 'x86/apic' into x86/core
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions