Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Nov 2010 22:38:06 +0000 (14:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Nov 2010 22:38:06 +0000 (14:38 -0800)
commit8f1b1a509658bee2397ddb9937cbfa1b71cdca17
tree502902dcef6b90920aecf525ec5da67918d21fa9
parenta01af8e4a4ee1135598f157051959982418c38f8
parent3f0d3d016d89a5efb8b926d4707eb21fa13f3d27
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