Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 2 Aug 2007 18:14:54 +0000 (11:14 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 2 Aug 2007 18:14:54 +0000 (11:14 -0700)
commit160d6aaf60d75b71a48223b5bdc29285e18cff07
tree62b9b82059dc3fd8353f9daf7f83da4293f7a493
parent22f675f320f721e9eaa2bbf7b883316b408c6c8f
parente6e0871cce2ae04f5790543ad2f4ec36b23260ba
Merge branch 'for-linus' of git://git./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