Merge branch 'next' into for-linus

This commit is contained in:
Dmitry Torokhov
2008-10-15 23:29:12 -04:00
51 changed files with 2309 additions and 352 deletions

View File

@ -796,6 +796,7 @@ and is between 256 and 4096 characters. It is defined in the file
Defaults to the default architecture's huge page size
if not specified.
i8042.debug [HW] Toggle i8042 debug mode
i8042.direct [HW] Put keyboard port into non-translated mode
i8042.dumbkbd [HW] Pretend that controller can only read data from
keyboard and cannot control its state