diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:16:54 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:16:54 +0200 |
| commit | dbff0a8826b2dd9abc0c7699ae883a95d468b12c (patch) | |
| tree | d6f9028ade424c14cd21fd41ae21a7f417af978d /net/unix/sysctl_net_unix.c | |
| parent | d5c2b894102e59efe499c231a32065afcf37e463 (diff) | |
| parent | af51c84e19753ec0c9de368816a30bcc4fb90c24 (diff) | |
| download | kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.tar.gz kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.tar.xz kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
AUTHORS
README
TODO
userspace/setkey.c
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions