Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jul 2010 15:20:16 +0000 (08:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jul 2010 15:20:16 +0000 (08:20 -0700)
commit58b164b50a6dba53c7b154f632c1f9d67832d3e4
tree75e60c80f57fc80f709d9cb24a3b435cd19943e5
parent20ba5efb9c788cb3308c8711757848cf0e596529
parent59f6fbe4291fcc078ba26ce4edf8373a7620a13a
Merge branch 'for-linus' of git://git./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