diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-09 00:08:22 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-09 00:08:22 +0100 |
commit | efa06708fe77190f31bed5c3cb5da49e211240f5 (patch) | |
tree | 2fcd5de639d93d23f525615e62a36c82cb758726 /net/ipv4/af_inet.c | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | selinux: Delete mls_copy_context (diff) | |
download | linux-efa06708fe77190f31bed5c3cb5da49e211240f5.tar.xz linux-efa06708fe77190f31bed5c3cb5da49e211240f5.zip |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
selinux: Delete mls_copy_context
Diffstat (limited to 'net/ipv4/af_inet.c')
0 files changed, 0 insertions, 0 deletions