From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 31 Aug 2011 02:47:36 +0000 (+1000)
Subject: Merge remote-tracking branch 'security/next'
X-Git-Tag: next-20110831~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b43331edef8904b6a061d7aec9ad592dc600a599;p=karo-tx-linux.git

Merge remote-tracking branch 'security/next'

Conflicts:
	fs/ocfs2/xattr.c
---

b43331edef8904b6a061d7aec9ad592dc600a599
diff --cc Documentation/kernel-parameters.txt
index 0c412ff39862,cd7c86110147..e54ec2d14aac
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -49,8 -48,8 +49,9 @@@ parameter is applicable
  	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled
  	EFI	EFI Partitioning (GPT) is enabled
  	EIDE	EIDE/ATAPI support is enabled.
+ 	EVM	Extended Verification Module
  	FB	The frame buffer device is enabled.
 +	FTRACE	Function tracing enabled.
  	GCOV	GCOV profiling is enabled.
  	HW	Appropriate hardware is enabled.
  	IA-64	IA-64 architecture is enabled.