Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
commitd20761a7995773dfae4a54fdd26a7857b861adb5
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jan 2011 09:56:47 +0000 (24 19:56 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jan 2011 09:56:47 +0000 (24 19:56 +1000)
tree14deebe09cf5a89a7b7ea1cab0ed45dbe4e5a627
parentff5fdb61493d95332945630fcae249f896098652
parent3ac285ff23cd6e1bc402b6db836521bce006eb89
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: return -ENOMEM when memory allocation fails
  tpm: fix panic caused by "tpm: Autodetect itpm devices"
  TPM: Long default timeout fix
  trusted keys: Fix a memory leak in trusted_update().
  keys: add trusted and encrypted maintainers
  encrypted-keys: rename encrypted_defined files to encrypted
  trusted-keys: rename trusted_defined files to trusted