From e905afc4a9267ac9ad20378cdcc6f534800c5dd6 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 25 Jan 2011 14:18:38 +0000
Subject: [PATCH] --- yaml --- r: 232351 b: refs/heads/master c:
 9cfe268ec4f76b7636687ccbe99be75e00085f32 h: refs/heads/master i:   232349:
 1094a06876eac5c1792475feb34645cab526d72a   232347:
 043e09f922123543d2c2d5423bcc79b1511a93d2   232343:
 0ec0c9f078e9b87970012eb4e7054d3ca24ff820   232335:
 10e192b2b24abcf33e84ac0fc037a97dad789187   232319:
 4fe8800772a93eec2fff4ae1269446c2f389a2e8 v: v3

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

diff --git a/[refs] b/[refs]
index 06a7581f33e4..52aea26a71d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecb5646cb098d9d1961c4b1af7b776c73b7541ac
+refs/heads/master: 9cfe268ec4f76b7636687ccbe99be75e00085f32
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index b72e071a3e5b..89835a4766a6 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -43,11 +43,11 @@ parameter is applicable:
 	AVR32	AVR32 architecture is enabled.
 	AX25	Appropriate AX.25 support is enabled.
 	BLACKFIN Blackfin architecture is enabled.
+	DRM	Direct Rendering Management support is enabled.
+	DYNAMIC_DEBUG Build in debug messages and enable them at runtime
 	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled
 	EFI	EFI Partitioning (GPT) is enabled
 	EIDE	EIDE/ATAPI support is enabled.
-	DRM	Direct Rendering Management support is enabled.
-	DYNAMIC_DEBUG Build in debug messages and enable them at runtime
 	FB	The frame buffer device is enabled.
 	GCOV	GCOV profiling is enabled.
 	HW	Appropriate hardware is enabled.