diff --git a/[refs] b/[refs]
index 194c27aa2d19..e4866bb13d73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23d028f69ab73957c0d40ae3e1a2654c985a95d6
+refs/heads/master: 30afddadac9b3423912e7729b5dec17d638e415f
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 2e53e97ad04d..3ea49f98d405 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -598,10 +598,6 @@ and is between 256 and 4096 characters. It is defined in the file
 			0: polling mode
 			non-0: interrupt mode (default)
 
-	eda=		[HW,PS2]
-
-	edb=		[HW,PS2]
-
 	edd=		[EDD]
 			Format: {"of[f]" | "sk[ipmbr]"}
 			See comment in arch/i386/boot/edd.S