Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Aug 2018 09:55:12 +0000 (17:55 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Aug 2018 09:55:12 +0000 (17:55 +0800)
commitc5f5aeef9b55b362ad5a0e04e4b41cd63b208842
tree0ee2bb561e879db0a990d998359f6516dff3393b
parenta4789089937941959be6c18fa53e1fc0189257fd
parentc7513c2a2714204d3588ecaa170ae628fd0d217e
Merge git://git./linux/kernel/git/torvalds/linux

Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm -
add missing kernel_neon_begin/end pair").
MAINTAINERS
arch/arm64/crypto/aes-glue.c
arch/arm64/crypto/ghash-ce-glue.c
crypto/morus640.c
crypto/sha3_generic.c
drivers/net/ethernet/broadcom/tg3.c
security/keys/dh.c