• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 · a205752d
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
      selinux: preserve boolean values across policy reloads
      selinux: change numbering of boolean directory inodes in selinuxfs
      selinux: remove unused enumeration constant from selinuxfs
      selinux: explicitly number all selinuxfs inodes
      selinux: export initial SID contexts via selinuxfs
      selinux: remove userland security class and permission definitions
      SELinux: move security_skb_extlbl_sid() out of the security server
      MAINTAINERS: update selinux entry
      SELinux: rename selinux_netlabel.h to netlabel.h
      SELinux: extract the NetLabel SELinux support from the security server
      NetLabel: convert a BUG_ON in the CIPSO code to a runtime check
      NetLabel: cleanup and document CIPSO constants