summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-25 11:50:41 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-25 11:50:41 +0100
commit79a66b96c339626a3e4b226fefc0e45244cfe6ff (patch)
tree9b0996354eb45bd89d6427b4143be3ffd6e5b96e /arch/x86/kernel/traps.c
parentbed4f13065b520e564adffbfcd1c1a764a9c887e (diff)
parentc1c15b65ec30275575dac9322aae607075769fbc (diff)
parent1fcccb008be12ea823aaa392758e1e41fb82de9a (diff)
parent4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff)
Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core