• Linus Torvalds's avatar
    Merge branch 'for-linus' of... · c54dcd8e
    Linus Torvalds authored
    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:
      selinux: Fix an uninitialized variable BUG/panic in selinux_secattr_to_sid()
      selinux: use default proc sid on symlinks
      file capabilities: uninline cap_safe_nice
      Update selinux info in MAINTAINERS and Kconfig help text
      SELinux: add gitignore file for mdp script
      SELinux: add boundary support and thread context assignment
      securityfs: do not depend on CONFIG_SECURITY
      selinux: add support for installing a dummy policy (v2)
      security: add/fix security kernel-doc
      selinux: Unify for- and while-loop style
      selinux: conditional expression type validation was off-by-one
      smack: limit privilege by label
      SELinux: Fix a potentially uninitialised variable in SELinux hooks
      SELinux: trivial, remove unneeded local variable
      SELinux: Trivial minor fixes that change C null character style
      make selinux_write_opts() static
    c54dcd8e
kernel-api.tmpl 21 KB