summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-29 14:38:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-29 14:38:06 -0800
commit8f1b1a509658bee2397ddb9937cbfa1b71cdca17 (patch)
tree502902dcef6b90920aecf525ec5da67918d21fa9 /lib
parenta01af8e4a4ee1135598f157051959982418c38f8 (diff)
parent3f0d3d016d89a5efb8b926d4707eb21fa13f3d27 (diff)
downloadlinux-3.10-8f1b1a509658bee2397ddb9937cbfa1b71cdca17.tar.gz
linux-3.10-8f1b1a509658bee2397ddb9937cbfa1b71cdca17.tar.bz2
linux-3.10-8f1b1a509658bee2397ddb9937cbfa1b71cdca17.zip
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
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions