Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Apr 2008 22:15:48 +0000 (15:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Apr 2008 22:15:48 +0000 (15:15 -0700)
commite199ceee15c8f8652cc3bb97651bdf246ba23c5f
tree1d6540d2f0724af08e117324326322e9c882260b
parentb24a31442e2ff66053ae4f76e9c69c557d59c7d1
parent618442509128fe4514be94de70ce54075cd9a706
Merge branch 'for-linus' of git://git./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