diff --git a/[refs] b/[refs] index c061f278e150..cc233e910a16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a073a8bde49b2c90777c526110488f4d0c52ea47 +refs/heads/master: f3e299fe3d53a0d78fea4e46ec3e0cadf375246c diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 456d18b25223..12b3b24bfd2f 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1368,7 +1368,7 @@ and is between 256 and 4096 characters. It is defined in the file reboot= [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode Format: [,[,...]] - See arch/*/kernel/reboot.c. + See arch/*/kernel/reboot.c or arch/*/kernel/process.c reserve= [KNL,BUGS] Force the kernel to ignore some iomem area