From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Nov 2010 22:38:06 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.37-rc4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f1b1a509658bee2397ddb9937cbfa1b71cdca17;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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:
  tpm: Autodetect itpm devices
---

8f1b1a509658bee2397ddb9937cbfa1b71cdca17