diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 11:20:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 11:20:16 -0400 |
| commit | 58b164b50a6dba53c7b154f632c1f9d67832d3e4 (patch) | |
| tree | 75e60c80f57fc80f709d9cb24a3b435cd19943e5 /arch | |
| parent | 20ba5efb9c788cb3308c8711757848cf0e596529 (diff) | |
| parent | 59f6fbe4291fcc078ba26ce4edf8373a7620a13a (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_tis: fix subsequent suspend failures
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions