Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.gi…

…t manually Some manual fixups required due to clashes with the PF_FREEZE cleanups.
git-mirror · Jun 27, 2005 · 3e0777b · 3e0777b
2 parents a94130e + e511988
commit 3e0777b
Show file tree

Hide file tree

Showing 79 changed files with 2,794 additions and 1,944 deletions.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
@@ -1115,7 +1115,7 @@ running once the system is up.
 			See Documentation/ramdisk.txt.
 
 	psmouse.proto=  [HW,MOUSE] Highest PS2 mouse protocol extension to
-			probe for (bare|imps|exps).
+			probe for (bare|imps|exps|lifebook|any).
 	psmouse.rate=	[HW,MOUSE] Set desired mouse report rate, in reports
 			per second.
 	psmouse.resetafter=