[GIT] Security subsystem updates for 2.6.38

[James Morris]

Please pull.

This is another round of updates, with a few bugfixes, filename 
changes in the new trusted & encryptped keys code as requested by 
dhowells, and a maintainers entry for that.


The following changes since commit 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5:
  Linus Torvalds (1):
        Linux 2.6.38-rc2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 for-linus

Davidlohr Bueso (1):
      selinux: return -ENOMEM when memory allocation fails

Jesper Juhl (1):
      trusted keys: Fix a memory leak in trusted_update().

Mimi Zohar (3):
      trusted-keys: rename trusted_defined files to trusted
      encrypted-keys: rename encrypted_defined files to encrypted
      keys: add trusted and encrypted maintainers

Olof Johansson (1):
      tpm: fix panic caused by "tpm: Autodetect itpm devices"

Rajiv Andrade (1):
      TPM: Long default timeout fix

 MAINTAINERS                                        |   22 ++++++++++++++++++++
 drivers/char/tpm/tpm.c                             |   10 +++++---
 drivers/char/tpm/tpm_tis.c                         |    6 ++--
 security/keys/Makefile                             |    4 +-
 security/keys/{encrypted_defined.c => encrypted.c} |    3 +-
 security/keys/{encrypted_defined.h => encrypted.h} |    0
 security/keys/{trusted_defined.c => trusted.c}     |    3 +-
 security/keys/{trusted_defined.h => trusted.h}     |    0
 security/selinux/ss/conditional.c                  |    2 +-
 security/selinux/ss/policydb.c                     |    4 +-
 10 files changed, 40 insertions(+), 14 deletions(-)
 rename security/keys/{encrypted_defined.c => encrypted.c} (99%)
 rename security/keys/{encrypted_defined.h => encrypted.h} (100%)
 rename security/keys/{trusted_defined.c => trusted.c} (99%)
 rename security/keys/{trusted_defined.h => trusted.h} (100%)

-- 
James Morris
<jmorris@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/