Merge branch 'linus' into locking/core, to pick up fixes
[muen/linux.git] / MAINTAINERS
index 6e950b8b4a4184b234000a20662d6e485605c820..011cc4c36b1d5de70db00c4e18dca2ec37e7b23d 100644 (file)
@@ -8152,6 +8152,24 @@ M:       Kees Cook <keescook@chromium.org>
 S:     Maintained
 F:     drivers/misc/lkdtm*
 
+LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
+M:     Alan Stern <stern@rowland.harvard.edu>
+M:     Andrea Parri <parri.andrea@gmail.com>
+M:     Will Deacon <will.deacon@arm.com>
+M:     Peter Zijlstra <peterz@infradead.org>
+M:     Boqun Feng <boqun.feng@gmail.com>
+M:     Nicholas Piggin <npiggin@gmail.com>
+M:     David Howells <dhowells@redhat.com>
+M:     Jade Alglave <j.alglave@ucl.ac.uk>
+M:     Luc Maranget <luc.maranget@inria.fr>
+M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+R:     Akira Yokosawa <akiyks@gmail.com>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+F:     tools/memory-model/
+F:     Documentation/memory-barriers.txt
+
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 M:     Chris Wright <chrisw@sous-sol.org>
 L:     linux-security-module@vger.kernel.org