From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 2 Aug 2007 18:14:54 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.23-rc2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=160d6aaf60d75b71a48223b5bdc29285e18cff07;p=linux-2.6-omap-h63xx.git

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:
  Net/Security: fix memory leaks from security_secid_to_secctx()
  SELinux: remove redundant pointer checks before calling kfree()
  SELinux: restore proper NetLabel caching behavior
---

160d6aaf60d75b71a48223b5bdc29285e18cff07