tree 415c2bdddfed5645aaa93c06b08cceb6403e9595
parent a4fb2122f1fc4a22bd6a5b8a195b952c2d31c54d
parent 910949a66839ff5f59fede5b7cb68ecf1453e22c
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1185388099 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1185388099 -0700

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