From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Sep 2011 02:57:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
X-Git-Tag: v3.1-rc8~18
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d942e43b58dc27b36305bcd374a74f7cc15183a3;hp=-c

Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security

* 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security:
  TPM: Zero buffer after copying to userspace
  TPM: Call tpm_transmit with correct size
  TPM: tpm_nsc: Fix a double free of pdev in cleanup_nsc
  TPM: TCG_ATMEL should depend on HAS_IOPORT
---

d942e43b58dc27b36305bcd374a74f7cc15183a3