diff options
author | 2008-12-10 10:13:57 -0800 | |
---|---|---|
committer | 2008-12-10 10:13:57 -0800 | |
commit | 4e6f2ba97ff9099ef03bd38f84b59b5c2f89c1fe (patch) | |
tree | 9029d50997bb9ab8ed175e24668f39f83244ea07 /net/unix/af_unix.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (diff) | |
parent | crypto: api - Disallow cryptomgr as a module if algorithms are built-in (diff) | |
download | linux-dev-4e6f2ba97ff9099ef03bd38f84b59b5c2f89c1fe.tar.xz linux-dev-4e6f2ba97ff9099ef03bd38f84b59b5c2f89c1fe.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: api - Disallow cryptomgr as a module if algorithms are built-in
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions