Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Jul 2007 18:28:19 +0000 (11:28 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Jul 2007 18:28:19 +0000 (11:28 -0700)
commit80492cc797ea15572de8eac766cbf606626ee338
tree415c2bdddfed5645aaa93c06b08cceb6403e9595
parenta4fb2122f1fc4a22bd6a5b8a195b952c2d31c54d
parent910949a66839ff5f59fede5b7cb68ecf1453e22c
Merge branch 'for-linus' of git://git./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