projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c41d40b 47970b1)
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)
commitf7909fb83550573300e72d120a7d97c9f6b53a65
tree20810edd4c137ce011b1ef7b751440a15d4088b7tree | snapshot (tar.gz zip)
parentc41d40b53306434628b577715487810816fca885commit | diff
parent47970b1b2aa64464bc0a9543e86361a622ae7c03commit | diff
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:
  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