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: MMI-PSA29.97-13-9~21650
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f1b1a509658bee2397ddb9937cbfa1b71cdca17;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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:
  tpm: Autodetect itpm devices
---

8f1b1a509658bee2397ddb9937cbfa1b71cdca17