diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-08 05:11:56 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-08 05:11:56 +0300 |
commit | 0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081 (patch) | |
tree | f0aa64e956d1d2addb2263ddcd238e9f014b36a0 /arch/cris/arch-v32/drivers/pci/dma.c | |
parent | 4e974c120039e35b90d2cb0459452bd9a6a71594 (diff) | |
parent | 39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff) | |
download | linux-0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081.tar.xz |
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
Diffstat (limited to 'arch/cris/arch-v32/drivers/pci/dma.c')
-rw-r--r-- | arch/cris/arch-v32/drivers/pci/dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/arch-v32/drivers/pci/dma.c b/arch/cris/arch-v32/drivers/pci/dma.c index 7072341995ff..dbbd3816cc0b 100644 --- a/arch/cris/arch-v32/drivers/pci/dma.c +++ b/arch/cris/arch-v32/drivers/pci/dma.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Dynamic DMA mapping support. * |