Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] tcrypt: Add missing error check
  [CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again

...

This commit is contained in:

Linus Torvalds 2007-05-18 20:46:45 -07:00

parent 1a06a52ee1 29059d12e0

commit 66123549db

2 changed files with 3 additions and 3 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

2

crypto/tcrypt.c

View file

4

drivers/crypto/Kconfig

View file