| commit | e199ceee15c8f8652cc3bb97651bdf246ba23c5f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 22 15:15:48 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 22 15:15:48 2008 -0700 |
| tree | 1d6540d2f0724af08e117324326322e9c882260b | |
| parent | b24a31442e2ff66053ae4f76e9c69c557d59c7d1 [diff] | |
| parent | 618442509128fe4514be94de70ce54075cd9a706 [diff] |
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