diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-29 23:38:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-29 23:38:06 +0100 |
| commit | 8f1b1a509658bee2397ddb9937cbfa1b71cdca17 (patch) | |
| tree | 502902dcef6b90920aecf525ec5da67918d21fa9 /lib/debug_locks.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | tpm: Autodetect itpm devices (diff) | |
| download | linux-8f1b1a509658bee2397ddb9937cbfa1b71cdca17.tar.xz linux-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/debug_locks.c')
0 files changed, 0 insertions, 0 deletions