]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 39f0650 b8c41ab)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Feb 2011 00:16:03 +0000 (16:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Feb 2011 00:16:03 +0000 (16:16 -0800)
commitcbf087e811e3a9f9a96b85371d612a3008c0d4f2
tree20810edd4c137ce011b1ef7b751440a15d4088b7tree | snapshot
parent39f065003876119ddb74dc53b8c66126964387e2commit | diff
parentb8c41aba50c78a0a8b876f6c5529b7749a427bc0commit | diff
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:
  pci: use security_capable() when checking capablities during config space read
  security: add cred argument to security_capable()
  tpm_tis: Use timeouts returned from TPM
Linux Kernel Source Tree.