From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Apr 2008 22:58:24 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.26-rc1~349
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259;p=~emulex%2Finfiniband.git

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
---

f5ba0cf3cb145f9a8cc125fb0cc013c5656d6259