| commit | 160d6aaf60d75b71a48223b5bdc29285e18cff07 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Aug 02 11:14:54 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Aug 02 11:14:54 2007 -0700 |
| tree | 62b9b82059dc3fd8353f9daf7f83da4293f7a493 | |
| parent | 22f675f320f721e9eaa2bbf7b883316b408c6c8f [diff] | |
| parent | e6e0871cce2ae04f5790543ad2f4ec36b23260ba [diff] |
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