]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e23cd1 bd04ab4)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 22:58:24 +0000 (15:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Apr 2008 22:58:24 +0000 (15:58 -0700)
commitfdae4c80129460903a86eac41bdd735ad5ea530b
treea361279ea74b52015e18299fbf77e91d042ef4eftree | snapshot
parent1e23cd1b14952b75ec97a8b1b6044ce9a2bfc732commit | diff
parentbd04ab41ddefb6ad4c499b6430eecfc6be91e156commit | 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:
  Smack: Integrate Smack with Audit
  Security: Typecast CAP_*_SET macros
  Security: Make secctx_to_secid() take const secdata
Linux Kernel Source Tree.