tree 02c01b36251f7b0afb1a98093e14efb17d015910
parent f429ee3b808118591d1f3cdf3c0d0793911a5677
parent f1be242c95257b199d8b679bc952ca33487c9af6
author Linus Torvalds <torvalds@linux-foundation.org> 1326847419 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326847419 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  integrity: digital signature config option name change
  lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts
  lib: MPILIB Kconfig description update
  lib: digital signature dependency fix
  lib: digital signature config option name change
  encrypted-keys: fix rcu and sparse messages
  keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages
  KEYS: Add missing smp_rmb() primitives to the keyring search code
  TOMOYO: Accept \000 as a valid character.
  security: update MAINTAINERS file with new git repo