| commit | 8f1b1a509658bee2397ddb9937cbfa1b71cdca17 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 29 14:38:06 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 29 14:38:06 2010 -0800 |
| tree | 502902dcef6b90920aecf525ec5da67918d21fa9 | |
| parent | a01af8e4a4ee1135598f157051959982418c38f8 [diff] | |
| parent | 3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 [diff] |
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