From 810c6afa1f1bf6811718a31c584e435a6658bc4c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 12 Jul 2008 05:33:30 +0200
Subject: [PATCH] --- yaml --- r: 101178 b: refs/heads/master c:
 de32a2434f7ce4600da90ecb44abcdc365ada1d0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f7d2efe4fa6f..ce1e32f29012 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38032f72601deac7aab00691c79e83d09b204e2a
+refs/heads/master: de32a2434f7ce4600da90ecb44abcdc365ada1d0
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index e07c432c731f..356b64ba706a 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -1571,6 +1571,10 @@ and is between 256 and 4096 characters. It is defined in the file
 			Format: { parport<nr> | timid | 0 }
 			See also Documentation/parport.txt.
 
+	pmtmr=		[X86] Manual setup of pmtmr I/O Port. 
+			Override pmtimer IOPort with a hex value.
+			e.g. pmtmr=0x508
+
 	pnpacpi=	[ACPI]
 			{ off }