diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-09 00:25:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-09 00:25:18 +0100 |
| commit | 9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6 (patch) | |
| tree | 9216a285bfe23aa799ca6efa01a3f4063d798e64 /crypto/serpent.c | |
| parent | [NET]: Fix net/socket.c warnings. (diff) | |
| parent | [CRYPTO] doc: added the developer of Camellia cipher (diff) | |
| download | linux-9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6.tar.xz linux-9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6.zip | |
Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts:
crypto/Kconfig
Diffstat (limited to 'crypto/serpent.c')
0 files changed, 0 insertions, 0 deletions