From 03f83dca4cc279a46b6bc13dd29c0637cf469dde Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 12 Jul 2005 13:58:33 -0700
Subject: [PATCH] --- yaml --- r: 4685 b: refs/heads/master c:
 41e2e8bec2da8d680a03aa4bee9a09fac499c05f h: refs/heads/master i:   4683:
 de7d28da81c0bac061b973ac2a70e6a6458cf02a v: v3

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

diff --git a/[refs] b/[refs]
index 35a34297b0be..b8e70ce62489 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e498c1080ae794a8dc788152002fb39994ae78b
+refs/heads/master: 41e2e8bec2da8d680a03aa4bee9a09fac499c05f
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 753db6d8b745..a998a8c2f95b 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -37,7 +37,7 @@ restrictions referred to are that the relevant option is valid if:
 	IA-32	IA-32 aka i386 architecture is enabled.
 	IA-64	IA-64 architecture is enabled.
 	IOSCHED	More than one I/O scheduler is enabled.
-	IP_PNP	IP DCHP, BOOTP, or RARP is enabled.
+	IP_PNP	IP DHCP, BOOTP, or RARP is enabled.
 	ISAPNP	ISA PnP code is enabled.
 	ISDN	Appropriate ISDN support is enabled.
 	JOY	Appropriate joystick support is enabled.