From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jul 2010 15:20:16 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=58b164b50a6dba53c7b154f632c1f9d67832d3e4;p=deliverable%2Flinux.git

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
---

58b164b50a6dba53c7b154f632c1f9d67832d3e4