aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 19:43:29 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 19:43:29 -0500
commit3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch)
treebaec074db38a5ceaaabbcee76f199acef43bb42a /arch/i386
parent0238cb4e7583c521bb3538060f98a73e65f61324 (diff)
parentfb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/vm86.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index 0c90ae54ddfa..f51c894a7da5 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -4,7 +4,7 @@
4 * Copyright (C) 1994 Linus Torvalds 4 * Copyright (C) 1994 Linus Torvalds
5 * 5 *
6 * 29 dec 2001 - Fixed oopses caused by unchecked access to the vm86 6 * 29 dec 2001 - Fixed oopses caused by unchecked access to the vm86
7 * stack - Manfred Spraul <manfreds@colorfullife.com> 7 * stack - Manfred Spraul <manfred@colorfullife.com>
8 * 8 *
9 * 22 mar 2002 - Manfred detected the stackfaults, but didn't handle 9 * 22 mar 2002 - Manfred detected the stackfaults, but didn't handle
10 * them correctly. Now the emulation will be in a 10 * them correctly. Now the emulation will be in a