Merge remote-tracking branch 'crypto/master'

diff --cc crypto/Kconfig
Simple merge

diff --cc crypto/shash.c
Simple merge

diff --cc drivers/char/hw_random/Kconfig
Simple merge

diff --cc drivers/crypto/atmel-aes.c
Simple merge

diff --cc drivers/crypto/atmel-sha.c
index 8bf9914d4d150b439e087688b51c884fdd1d022c,63b09e01075c9a5c34abc1c294e562909f4cf550..f8407dc7dd38a306991851152c932fe06ac6ddc9
--- 1/drivers/crypto/atmel-sha.c
--- 2/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@@ -1461,9 -1583,8 +1587,10 @@@ err_algs
        if (sha_dd->caps.has_dma)
                atmel_sha_dma_cleanup(sha_dd);
  err_sha_dma:
 +iclk_unprepare:
 +      clk_unprepare(sha_dd->iclk);
  res_err:
+       tasklet_kill(&sha_dd->queue_task);
        tasklet_kill(&sha_dd->done_task);
  sha_dd_err:
        dev_err(dev, "initialization failed.\n");

diff --cc fs/ecryptfs/main.c
Simple merge

diff --cc fs/ext4/crypto.c
Simple merge

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/bluetooth/smp.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_fastopen.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge