diff --git a/[refs] b/[refs] index 04178de4cf69..da679627bd7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac0bf14df705f5fa93a06a62e51e632b4394ee41 +refs/heads/master: 02a72fd6757c955ea8fe81e6ec3ab07a2a9e6ba5 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 59b1ab5d30df..fc84490fdb05 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -294,9 +294,6 @@ and is between 256 and 4096 characters. It is defined in the file apm= [APM] Advanced Power Management See header of arch/i386/kernel/apm.c. - applicom= [HW] - Format: , - arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards Format: ,,