From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 25 Jul 2007 18:28:19 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.23-rc2~272
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=80492cc797ea15572de8eac766cbf606626ee338;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: null-terminate context string in selinux_xfrm_sec_ctx_alloc
---

80492cc797ea15572de8eac766cbf606626ee338