tree d57fe1a7c4214afbaacbcc5fb62ea6a5e9169b3f
parent 702ed6ef375c19d65f2eeeefd3851476f2c4cee4
parent d4cf291526a74cc33d33700a35b74395eec812fd
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184273208 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184273208 -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:
  security: unexport mmap_min_addr
  SELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabel
  security: Protection for exploiting null dereference using mmap
  SELinux: Use %lu for inode->i_no when printing avc
  SELinux: allow preemption between transition permission checks
  selinux: introduce schedule points in policydb_destroy()
  selinux: add selinuxfs structure for object class discovery
  selinux: change sel_make_dir() to specify inode counter.
  selinux: rename sel_remove_bools() for more general usage.
  selinux: add support for querying object classes and permissions from the running policy