tree 75e60c80f57fc80f709d9cb24a3b435cd19943e5
parent 20ba5efb9c788cb3308c8711757848cf0e596529
parent 59f6fbe4291fcc078ba26ce4edf8373a7620a13a
author Linus Torvalds <torvalds@linux-foundation.org> 1280157616 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1280157616 -0700

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