diff --git a/[refs] b/[refs] index 32f8269a2f13..74da51119822 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65ee7f45cf075adcdd6b6ef365f5a5507f1ea5c5 +refs/heads/master: 663728418e3494f8e4a82f5d1b2f23c22d11be35 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 58f5a7fbf67d..c3b4b5b8e4db 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6203,6 +6203,15 @@ 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 +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 S: Odd Fixes