From a9ae9ce646af034bcdd2ca1d972dd01c743fd720 Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hp.com>
Date: Thu, 4 Feb 2010 13:36:50 -0800
Subject: [PATCH] --- yaml --- r: 183967 b: refs/heads/master c:
 b0f83b280fcfa9cdd66b748f0c12fb26ce69e391 h: refs/heads/master i:   183965:
 51859894f9da242f927c0e2c86e1358eac72ee1d   183963:
 a694f438efc667644727ec2ac981a10c9daa12a7   183959:
 4e48e7d8cfff081be8b57141c78bafb9a79bb6b5   183951:
 ae83811deb109291520a96c76f283639929cd3aa   183935:
 2d0ca5a02cb87b2b317f097295628f805ed8ff23 v: v3

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

diff --git a/[refs] b/[refs]
index 6712ce7384d5..e524d623f436 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15c052fc7f4a1b3544602be8af77e31bba9261bf
+refs/heads/master: b0f83b280fcfa9cdd66b748f0c12fb26ce69e391
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 736d45602886..3ca7f8f56525 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -54,6 +54,7 @@ parameter is applicable:
 	IMA     Integrity measurement architecture is enabled.
 	IOSCHED	More than one I/O scheduler is enabled.
 	IP_PNP	IP DHCP, BOOTP, or RARP is enabled.
+	IPV6	IPv6 support is enabled.
 	ISAPNP	ISA PnP code is enabled.
 	ISDN	Appropriate ISDN support is enabled.
 	JOY	Appropriate joystick support is enabled.
@@ -347,6 +348,9 @@ and is between 256 and 4096 characters. It is defined in the file
 			Change the amount of debugging information output
 			when initialising the APIC and IO-APIC components.
 
+	autoconf=	[IPV6]
+			See Documentation/networking/ipv6.txt.
+
 	show_lapic=	[APIC,X86] Advanced Programmable Interrupt Controller
 			Limit apic dumping. The parameter defines the maximal
 			number of local apics being dumped. Also it is possible
@@ -629,6 +633,12 @@ and is between 256 and 4096 characters. It is defined in the file
 			See drivers/char/README.epca and
 			Documentation/serial/digiepca.txt.
 
+	disable=	[IPV6]
+			See Documentation/networking/ipv6.txt.
+
+	disable_ipv6=	[IPV6]
+			See Documentation/networking/ipv6.txt.
+
 	disable_mtrr_cleanup [X86]
 			The kernel tries to adjust MTRR layout from continuous
 			to discrete, to make X server driver able to add WB