---

yaml --- r: 118532 b: refs/heads/master c: da85f86 h: refs/heads/master v: v3
git-mirror · Nov 6, 2008 · 87b033c · 87b033c
1 parent 6f60709
commit 87b033c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b4897688011cd05e07f00dcfe6af3331eb36a3c
+refs/heads/master: da85f865b1dcec0853c48b763ed312441ce0c7df
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -1494,7 +1494,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
 	def_bool X86_64
 	depends on NUMA
 
-menu "Power management options"
+menu "Power management and ACPI options"
 	depends on !X86_VOYAGER
 
 config ARCH_HIBERNATION_HEADER