David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-04-23 23:15:17 -04:00

..

async_tx

crypto: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:16 +08:00

ablkcipher.c

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

2012-04-10 14:30:45 -04:00

aead.c

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

2012-04-10 14:30:45 -04:00

aes_generic.c

…

af_alg.c

…

ahash.c

crypto: Stop using NLA_PUT*().

2012-04-02 04:33:42 -04:00

algapi.c

crypto: Add bulk algorithm registration interface

2012-01-26 13:35:49 +11:00

algboss.c

…

algif_hash.c

…

algif_skcipher.c

…

ansi_cprng.c

crypto: ansi_cprng - enforce key != seed in fips mode

2011-11-09 12:04:06 +08:00

anubis.c

…

api.c

…

arc4.c

…

authenc.c

…

authencesn.c

…

blkcipher.c

crypto: Stop using NLA_PUT*().

2012-04-02 04:33:42 -04:00

blowfish_common.c

…

blowfish_generic.c

…

camellia_generic.c

crypto: camellia - rename camellia.c to camellia_generic.c

2012-03-14 17:25:55 +08:00

cast5.c

…

cast6.c

…

cbc.c

…

ccm.c

crypto: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:16 +08:00

chainiv.c

…

cipher.c

…

compress.c

…

crc32c.c

crypto: crc32c should use library implementation

2012-03-23 16:58:38 -07:00

cryptd.c

…

crypto_null.c

…

crypto_user.c

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

2012-04-10 14:30:45 -04:00

crypto_wq.c

crypto: add module.h to those files that are explicitly using it

2011-10-31 19:31:11 -04:00

ctr.c

…

cts.c

…

deflate.c

…

des_generic.c

…

ecb.c

…

eseqiv.c

…

fcrypt.c

…

fips.c

…

gcm.c

…

gf128mul.c

…

ghash-generic.c

…

hmac.c

…

internal.h

…

Kconfig

um: several x86 hw-dependent crypto modules won't build on uml

2012-04-09 14:02:13 -04:00

khazad.c

…

krng.c

…

lrw.c

crypto: lrw - add interface for parallelized cipher implementions

2011-11-09 11:50:31 +08:00

lzo.c

…

Makefile

crypto: camellia - rename camellia.c to camellia_generic.c

2012-03-14 17:25:55 +08:00

md4.c

crypto: add module.h to those files that are explicitly using it

2011-10-31 19:31:11 -04:00

md5.c

…

michael_mic.c

…

pcbc.c

…

pcompress.c

crypto: Stop using NLA_PUT*().

2012-04-02 04:33:42 -04:00

pcrypt.c

crypto: pcrypt - Use the online cpumask as the default

2012-03-29 19:52:47 +08:00

proc.c

crypto: add module.h to those files that are explicitly using it

2011-10-31 19:31:11 -04:00

ripemd.h

…

rmd128.c

…

rmd160.c

…

rmd256.c

…

rmd320.c

…

rng.c

crypto: Stop using NLA_PUT*().

2012-04-02 04:33:42 -04:00

salsa20_generic.c

…

scatterwalk.c

crypto: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:16 +08:00

seed.c

…

seqiv.c

…

serpent_generic.c

crypto: serpent - rename serpent.c to serpent_generic.c

2011-11-30 16:12:44 +08:00

sha1_generic.c

…

sha256_generic.c

…

sha512_generic.c

crypto: sha512 - Fix byte counter overflow in SHA-512

2012-04-05 20:34:20 +08:00

shash.c

crypto: Stop using NLA_PUT*().

2012-04-02 04:33:42 -04:00

tcrypt.c

crypto: tcrypt - add more camellia tests

2012-03-14 17:25:55 +08:00

tcrypt.h

crypto: tcrypt - add xts(serpent) tests

2011-11-09 11:57:56 +08:00

tea.c

…

testmgr.c

crypto: testmgr - add more camellia test vectors

2012-03-14 17:25:54 +08:00

testmgr.h

crypto: testmgr - add more camellia test vectors

2012-03-14 17:25:54 +08:00

tgr192.c

…

twofish_common.c

crypto: twofish-x86_64-3way - add lrw support

2011-11-09 11:53:32 +08:00

twofish_generic.c

…

vmac.c

crypto: add module.h to those files that are explicitly using it

2011-10-31 19:31:11 -04:00

wp512.c

crypto: whirlpool - count rounds from 0

2011-10-21 14:24:16 +02:00

xcbc.c

crypto: add module.h to those files that are explicitly using it

2011-10-31 19:31:11 -04:00

xor.c

…

xts.c

crypto: xts: add interface for parallelized cipher implementations

2011-11-09 11:56:06 +08:00

zlib.c

…