diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 15:15:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 15:15:48 -0700 |
commit | e199ceee15c8f8652cc3bb97651bdf246ba23c5f (patch) | |
tree | 1d6540d2f0724af08e117324326322e9c882260b /arch/frv/Makefile | |
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
Diffstat (limited to 'arch/frv/Makefile')
0 files changed, 0 insertions, 0 deletions