diff options
| author | Joerg Roedel | 2019-06-24 10:23:16 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2019-06-24 10:23:16 +0200 |
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /arch/arm64/mm/dma-mapping.c | |
| parent | iommu/dma: Fix condition check in iommu_dma_unmap_sg (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | kernel-qcow2-linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.tar.gz kernel-qcow2-linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.tar.xz kernel-qcow2-linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.zip | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'arch/arm64/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 1669618db08a..9c588a1d6ffd 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2012 ARM Ltd. * Author: Catalin Marinas <catalin.marinas@arm.com> |