David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-15 11:43:53 -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	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
ahash.c	crypto: Stop using NLA_PUT*().	2012-04-02 04:33:42 -04:00
algapi.c	crypto: algapi - Move larval completion into algboss	2012-06-22 20:08:29 +08:00
algboss.c	crypto: algapi - Fix hang on crypto allocation	2012-06-27 20:59:12 +08:00
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	crypto: arc4 - improve performance by using u32 for ctx and variables	2012-06-14 10:07:23 +08:00
authenc.c	crypto: authenc - Fix crash with zero-length assoc data	2012-09-11 12:05:45 +08:00
authencesn.c
blkcipher.c	crypto: Stop using NLA_PUT*().	2012-04-02 04:33:42 -04:00
blowfish_common.c	crypto: blowfish - split generic and common c code	2011-09-22 21:25:25 +10:00
blowfish_generic.c	crypto: blowfish - rename C-version to blowfish_generic	2011-09-22 21:25:26 +10:00
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: cryptd - Use subsys_initcall to prevent races with aesni	2011-08-20 16:08:03 +08:00
crypto_null.c
crypto_user.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -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	crypto: ghash - Avoid null pointer dereference if no key is set	2011-10-21 13:18:42 +02:00
hmac.c
internal.h	crypto: algapi - Move larval completion into algboss	2012-06-22 20:08:29 +08:00
Kconfig	crypto: arc4 - now arc needs blockcipher support	2012-06-27 14:42:07 +08: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	crypto: Move md5_transform to lib/md5.c	2011-08-06 18:32:45 -07:00
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	crypto: sha1 - export sha1_update for reuse	2011-08-10 19:00:28 +08:00
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: atmel - add new tests to tcrypt	2012-07-11 11:08:28 +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 aead cbc aes hmac sha1,256,512 test vectors	2012-07-11 11:08:30 +08:00
testmgr.h	crypto: testmgr - add aead cbc aes hmac sha1,256,512 test vectors	2012-07-11 11:08:30 +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	md updates for 3.5	2012-05-23 17:08:40 -07:00
xts.c	crypto: xts: add interface for parallelized cipher implementations	2011-11-09 11:56:06 +08:00
zlib.c