Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm -
add missing kernel_neon_begin/end pair").

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/crypto/aes-glue.c
Simple merge

diff --cc arch/arm64/crypto/ghash-ce-glue.c
Simple merge

diff --cc crypto/morus640.c
Simple merge

diff --cc crypto/sha3_generic.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc security/keys/dh.c
Simple merge