]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c65a350 d20bdda)
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)
commitf5ba0cf3cb145f9a8cc125fb0cc013c5656d6259
treea361279ea74b52015e18299fbf77e91d042ef4eftree | snapshot
parentc65a3500b2947d344862da8cce626b7cc7ec5758commit | diff
parentd20bdda6d45a4035e48ca7ae467a0d955c1ffc60commit | 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 2.6 source tree