summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 20:07:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-14 20:07:31 -0700
commit18240904960a39e582ced8ba8ececb10b8c22dd3 (patch)
tree90cbad5533c17657969acb97a0371e41923f7f93 /kernel/Makefile
parentf86054c24565d09d1997f03192761dabf6b8a9c9 (diff)
parent8a478905adbb2e09a59644e76f7fe7e0ab644204 (diff)
downloadlwn-18240904960a39e582ced8ba8ececb10b8c22dd3.tar.gz
lwn-18240904960a39e582ced8ba8ececb10b8c22dd3.zip
Merge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX KEYS: Fix garbage collector KEYS: Unlock tasklist when exiting early from keyctl_session_to_parent CRED: Allow put_cred() to cope with a NULL groups list SELinux: flush the avc before disabling SELinux SELinux: seperate avc_cache flushing Creds: creds->security can be NULL is selinux is disabled
Diffstat (limited to 'kernel/Makefile')
0 files changed, 0 insertions, 0 deletions