Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

48467641

Commit 48467641 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 3863e724 d70063c4

No related branches found

No related tags found

No related merge requests found

Changes 43

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/crypto/api-intro.txt 1 addition, 0 deletions

Documentation/crypto/api-intro.txt
crypto/Kconfig 4 additions, 1 deletion

crypto/Kconfig
crypto/api.c 2 additions, 1 deletion

crypto/api.c
crypto/cipher.c 0 additions, 4 deletions

crypto/cipher.c
crypto/internal.h 2 additions, 1 deletion

crypto/internal.h
crypto/tcrypt.c 10 additions, 1 deletion

crypto/tcrypt.c
crypto/tcrypt.h 115 additions, 23 deletions

crypto/tcrypt.h
crypto/tea.c 77 additions, 4 deletions

crypto/tea.c
drivers/atm/zatm.c 2 additions, 2 deletions

drivers/atm/zatm.c
drivers/block/cryptoloop.c 4 additions, 2 deletions

drivers/block/cryptoloop.c
drivers/md/dm-crypt.c 4 additions, 3 deletions

drivers/md/dm-crypt.c
drivers/net/sungem.c 1 addition, 0 deletions

drivers/net/sungem.c
drivers/net/sungem.h 1 addition, 1 deletion

drivers/net/sungem.h
drivers/net/tg3.c 15 additions, 13 deletions

drivers/net/tg3.c
drivers/net/tun.c 15 additions, 0 deletions

drivers/net/tun.c
drivers/net/wireless/airo.c 2 additions, 3 deletions

drivers/net/wireless/airo.c
fs/nfsd/nfs4recover.c 2 additions, 3 deletions

fs/nfsd/nfs4recover.c
include/linux/crypto.h 1 addition, 0 deletions

include/linux/crypto.h
include/linux/if_tun.h 1 addition, 0 deletions

include/linux/if_tun.h
include/net/ip_vs.h 1 addition, 1 deletion

include/net/ip_vs.h

with 260 additions and 63 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment