tree 90cbad5533c17657969acb97a0371e41923f7f93
parent f86054c24565d09d1997f03192761dabf6b8a9c9
parent 8a478905adbb2e09a59644e76f7fe7e0ab644204
author Linus Torvalds <torvalds@linux-foundation.org> 1252984051 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252984051 -0700

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