diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 17:55:12 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 17:55:12 +0800 |
| commit | c5f5aeef9b55b362ad5a0e04e4b41cd63b208842 (patch) | |
| tree | 0ee2bb561e879db0a990d998359f6516dff3393b /arch/nios2/mm/dma-mapping.c | |
| parent | a4789089937941959be6c18fa53e1fc0189257fd (diff) | |
| parent | c7513c2a2714204d3588ecaa170ae628fd0d217e (diff) | |
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").
Diffstat (limited to 'arch/nios2/mm/dma-mapping.c')
0 files changed, 0 insertions, 0 deletions