diff --git a/[refs] b/[refs] index 1ba03330c3a5..35cca7298f9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c91aedb75d1b87deccf16d58f67fb46402d7d44 +refs/heads/master: 541cecac534ea0df95fbc76b0a3091e91b101895 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 67e99f144199..4ec75c06bca4 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -437,10 +437,6 @@ running once the system is up. Format: {"of[f]" | "sk[ipmbr]"} See comment in arch/i386/boot/edd.S - edd [EDD] - Format: {"of[f]" | "sk[ipmbr]"} - See comment in arch/i386/boot/edd.S - eicon= [HW,ISDN] Format: ,,