Merge branch 'arm/common' into next

git-mirror · Sep 25, 2013 · 3203209 · 3203209
2 parents 9efff38 + 4e28308
commit 3203209
Show file tree

Hide file tree

Showing 6 changed files with 712 additions and 567 deletions.
diff --git a/Documentation/x86/efi-stub.txt → Documentation/efi-stub.txt b/Documentation/x86/efi-stub.txt → Documentation/efi-stub.txt
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
@@ -1579,7 +1579,7 @@ config EFI_STUB
           This kernel feature allows a bzImage to be loaded directly
 	  by EFI firmware without the use of a bootloader.
 
-	  See Documentation/x86/efi-stub.txt for more information.
+	  See Documentation/efi-stub.txt for more information.
 
 config SECCOMP
 	def_bool y