Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index ccc8a14520ae5ebcc8d4506cd361fc89f5118b76,14bc7071f9dfe692b495b50159d1799621d8ba04..30acb697e169f59488bc766300383011d371b48d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6133,15 -6194,15 +6194,24 @@@ S:   Maintaine
  F:    include/linux/sl?b*.h
  F:    mm/sl?b.c
  
+ SLEEPABLE READ-COPY UPDATE (SRCU)
+ M:    Lai Jiangshan <laijs@cn.fujitsu.com>
+ M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ W:    http://www.rdrop.com/users/paulmck/RCU/
+ S:    Supported
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+ F:    include/linux/srcu*
+ F:    kernel/srcu*
+ 
 +SMACK SECURITY MODULE
 +M:    Casey Schaufler <casey@schaufler-ca.com>
 +L:    linux-security-module@vger.kernel.org
 +W:    http://schaufler-ca.com
 +T:    git git://git.gitorious.org/smack-next/kernel.git
 +S:    Maintained
 +F:    Documentation/security/Smack.txt
 +F:    security/smack/
 +
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Odd Fixes

diff --cc security/smack/smack_lsm.c
Simple merge