]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit180d2f6654bb6c4d99ddd53ea5fcbcdf77e36ea0
tree75e60c80f57fc80f709d9cb24a3b435cd19943e5
parent90009e07fac80460f87f8021be97d8742abb5027
parent641e75fd534f905836dce1371c6335377b541522
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