diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 17:20:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 17:20:16 +0200 |
| commit | 58b164b50a6dba53c7b154f632c1f9d67832d3e4 (patch) | |
| tree | 75e60c80f57fc80f709d9cb24a3b435cd19943e5 /arch/arm | |
| parent | Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | tpm_tis: fix subsequent suspend failures (diff) | |
| download | linux-58b164b50a6dba53c7b154f632c1f9d67832d3e4.tar.xz linux-58b164b50a6dba53c7b154f632c1f9d67832d3e4.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_tis: fix subsequent suspend failures
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions