]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 01:09:36 +0000 (12:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 01:09:36 +0000 (12:09 +1100)
commiteade3e4f1abe67c334563df478b34713464eccd6
tree3e80989d132544f237aeb1246856bec401379f82
parent716a8a9be702233213fb570c339b81bc69765756
parentf75516a81548074be331b3e41d2e3f448d1f8b8d
Merge remote-tracking branch 'crypto/master'
15 files changed:
crypto/Kconfig
crypto/shash.c
drivers/char/hw_random/Kconfig
drivers/crypto/atmel-aes.c
drivers/crypto/atmel-sha.c
fs/ecryptfs/main.c
fs/ext4/crypto.c
include/net/sctp/structs.h
include/net/tcp.h
net/bluetooth/smp.c
net/ipv4/tcp.c
net/ipv4/tcp_fastopen.c
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c
net/sctp/socket.c