Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse source

Conflicts:

	crypto/Kconfig

...

This commit is contained in:

David S. Miller 2007-02-08 15:25:18 -08:00

parent 4387ff75f2 dc2e2f33bb

commit 9783e1df7a

28 changed files with 3396 additions and 733 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

148

include/linux/crypto.h

View file

1

include/linux/pfkeyv2.h

View file