diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /include/linux/dma-iommu.h | |
| parent | iommu/dma: Fix condition check in iommu_dma_unmap_sg (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | linux-dev-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.tar.xz linux-dev-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.zip | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'include/linux/dma-iommu.h')
| -rw-r--r-- | include/linux/dma-iommu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 05556f4d9cce..2112f21f73d8 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2014-2015 ARM Ltd. */ |