Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  tpm: Autodetect itpm devices

...

This commit is contained in:

Linus Torvalds 2010-11-29 14:38:06 -08:00

parent a01af8e4a4 3f0d3d016d

commit 8f1b1a5096

1 changed files with 24 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

24

drivers/char/tpm/tpm_tis.c

View file