| commit | f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 15:58:24 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 15:58:24 2008 -0700 |
| tree | a361279ea74b52015e18299fbf77e91d042ef4ef | |
| parent | c65a3500b2947d344862da8cce626b7cc7ec5758 [diff] | |
| parent | d20bdda6d45a4035e48ca7ae467a0d955c1ffc60 [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