diff --git a/[refs] b/[refs] index f2f546898ea2..4b6a5b1e65f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd9fcb44a7edf69c6f3f045cba0db106c194fcc1 +refs/heads/master: cd1c34f21f5bd1035aec3d082bbb0583b994a2b5 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index b97e1b9d8c02..b884ade006ca 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1619,8 +1619,6 @@ and is between 256 and 4096 characters. It is defined in the file serialnumber [BUGS=X86-32] - sg_def_reserved_size= [SCSI] - shapers= [NET] Maximal number of shapers.