diff --git a/[refs] b/[refs]
index f185dfcd447f..651cbabd150d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8af7c6ab0bc4e2404f290801982b40223a97408
+refs/heads/master: 9f5e0bffe59a27767e40753c8effd2357d5f68d3
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 0a3fed445249..98062e15dc3d 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -614,9 +614,6 @@ and is between 256 and 4096 characters. It is defined in the file
 			Format: {"of[f]" | "sk[ipmbr]"}
 			See comment in arch/i386/boot/edd.S
 
-	eicon=		[HW,ISDN]
-			Format: <id>,<membase>,<irq>
-
 	eisa_irq_edge=	[PARISC,HW]
 			See header of drivers/parisc/eisa.c.