From 21e4be6ec523a417ac9fa37869cb4c64c1a247f3 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 29 Jun 2005 08:43:49 -0700
Subject: [PATCH] --- yaml --- r: 3930 b: refs/heads/master c:
 541cecac534ea0df95fbc76b0a3091e91b101895 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/kernel-parameters.txt | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

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: <id>,<membase>,<irq>