From b302e87887df6e025468a4b3dd6378413fef38ad Mon Sep 17 00:00:00 2001
From: Chuck Ebbert <cebbert@redhat.com>
Date: Wed, 24 Sep 2008 20:40:34 -0400
Subject: [PATCH] --- yaml --- r: 116729 b: refs/heads/master c:
 e5665a45fa28d0114f61b5d534a3b2678592219d h: refs/heads/master i:   116727:
 57a59e22f913c96e0099836464a31fcbe9991364 v: v3

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

diff --git a/[refs] b/[refs]
index 60b40fc5afd5..77fad806bf0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa42d7c6138afdc54f74e971456a0fbfec16b77b
+refs/heads/master: e5665a45fa28d0114f61b5d534a3b2678592219d
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 08fbc8372ba4..53ba7c7d82b3 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -1678,6 +1678,12 @@ and is between 256 and 4096 characters. It is defined in the file
 				reserved for the CardBus bridge's memory
 				window. The default value is 64 megabytes.
 
+	pcie_aspm=	[PCIE] Forcibly enable or disable PCIe Active State Power
+			Management.
+		off	Disable ASPM.
+		force	Enable ASPM even on devices that claim not to support it.
+			WARNING: Forcing ASPM on may cause system lockups.
+
 	pcmv=		[HW,PCMCIA] BadgePAD 4
 
 	pd.		[PARIDE]