author | Herbert Xu <herbert@gondor.apana.org.au> | |
Fri, 3 Aug 2018 09:55:12 +0000 (17:55 +0800) | ||
committer | Herbert Xu <herbert@gondor.apana.org.au> | |
Fri, 3 Aug 2018 09:55:12 +0000 (17:55 +0800) |
Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm -
add missing kernel_neon_begin/end pair").
add missing kernel_neon_begin/end pair").
1 | 2 | |||
---|---|---|---|---|
MAINTAINERS | patch | | diff1 | | diff2 | | blob | history |
arch/arm64/crypto/aes-glue.c | patch | | diff1 | | diff2 | | blob | history |
arch/arm64/crypto/ghash-ce-glue.c | patch | | diff1 | | diff2 | | blob | history |
crypto/morus640.c | patch | | diff1 | | diff2 | | blob | history |
crypto/sha3_generic.c | patch | | diff1 | | diff2 | | blob | history |
drivers/net/ethernet/broadcom/tg3.c | patch | | diff1 | | diff2 | | blob | history |
security/keys/dh.c | patch | | diff1 | | diff2 | | blob | history |
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