From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Sep 2009 03:07:31 +0000 (-0700)
Subject: Merge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.32-rc1~683
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=18240904960a39e582ced8ba8ececb10b8c22dd3;p=~emulex%2Finfiniband.git

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
---

18240904960a39e582ced8ba8ececb10b8c22dd3