tree 1d6540d2f0724af08e117324326322e9c882260b
parent b24a31442e2ff66053ae4f76e9c69c557d59c7d1
parent 618442509128fe4514be94de70ce54075cd9a706
author Linus Torvalds <torvalds@linux-foundation.org> 1208902548 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1208902548 -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 fixups needed for preemptable RCU from -rt
  SELinux: no BUG_ON(!ss_initialized) in selinux_clone_mnt_opts