From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 03:57:58 +0000 (+1100)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20111012~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=52ff8031fb83687e5ff9efc45ab10ca378339e2d;p=karo-tx-linux.git

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	Documentation/PCI/pci.txt
	arch/arm/mach-nuc93x/time.c
	drivers/net/Kconfig
---

52ff8031fb83687e5ff9efc45ab10ca378339e2d
diff --cc Documentation/kernel-parameters.txt
index e54ec2d14aac,be9370c764c8..ea66883b9a04
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -725,13 -724,13 +725,13 @@@ bytes respectively. Such letter suffixe
  
  	elevator=	[IOSCHED]
  			Format: {"cfq" | "deadline" | "noop"}
- 			See Documentation/block/as-iosched.txt and
+ 			See Documentation/block/cfq-iosched.txt and
  			Documentation/block/deadline-iosched.txt for details.
  
 -	elfcorehdr=	[IA-64,PPC,SH,X86]
 +	elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]
  			Specifies physical address of start of kernel core
 -			image elf header. Generally kexec loader will
 -			pass this option to capture kernel.
 +			image elf header and optionally the size. Generally
 +			kexec loader will pass this option to capture kernel.
  			See Documentation/kdump/kdump.txt for details.
  
  	enable_mtrr_cleanup [X86]