Manual merge with Linus

This commit is contained in:
Dmitry Torokhov
2005-09-09 20:14:47 -05:00
3056 changed files with 144611 additions and 124862 deletions

View File

@@ -1175,6 +1175,11 @@ running once the system is up.
New name for the ramdisk parameter.
See Documentation/ramdisk.txt.
rdinit= [KNL]
Format: <full_path>
Run specified binary instead of /init from the ramdisk,
used for early userspace startup. See initrd.
reboot= [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
Format: <reboot_mode>[,<reboot_mode2>[,...]]
See arch/*/kernel/reboot.c.