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

Pull security subsystem updates from James Morris:
 "Nothing groundbreaking for this kernel, just cleanups and fixes, and a
  couple of Smack enhancements."

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (21 commits)
  Smack: Maintainer Record
  Smack: don't show empty rules when /smack/load or /smack/load2 is read
  Smack: user access check bounds
  Smack: onlycap limits on CAP_MAC_ADMIN
  Smack: fix smack_new_inode bogosities
  ima: audit is compiled only when enabled
  ima: ima_initialized is set only if successful
  ima: add policy for pseudo fs
  ima: remove unused cleanup functions
  ima: free securityfs violations file
  ima: use full pathnames in measurement list
  security: Fix nommu build.
  samples: seccomp: add .gitignore for untracked executables
  tpm: check the chip reference before using it
  TPM: fix memleak when register hardware fails
  TPM: chip disabled state erronously being reported as error
  MAINTAINERS: TPM maintainers' contacts update
  Merge branches 'next-queue' and 'next' into next
  Remove unused code from MPI library
  Revert "crypto: GnuPG based MPI lib - additional sources (part 4)"
  ...

1 files changed, 13 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index fe2fa33e2831..3086d4b12711 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6230,6 +6230,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 <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
@@ -6862,10 +6871,11 @@ F:	include/linux/shmem_fs.h
 F:      mm/shmem.c
 
 TPM DEVICE DRIVER
-M:      Debora Velarde <debora@linux.vnet.ibm.com>
-M:      Rajiv Andrade <srajiv@linux.vnet.ibm.com>
+M:      Kent Yoder <key@linux.vnet.ibm.com>
+M:      Rajiv Andrade <mail@srajiv.net>
 W:      http://tpmdd.sourceforge.net
-M:      Marcel Selhorst <m.selhorst@sirrix.com>
+M:      Marcel Selhorst <tpmdd@selhorst.net>
+M:      Sirrix AG <tpmdd@sirrix.com>
 W:      http://www.sirrix.com
 L:      tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:      Maintained