diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-04 01:26:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-04 01:26:51 +0100 |
| commit | 2a171788ba7bb61995e98e8163204fc7880f63b2 (patch) | |
| tree | 4150a94dd08323748116e5051e56ddee830d4812 /arch/x86/include/asm/swiotlb.h | |
| parent | liquidio: Fix an issue with multiple switchdev enable disables (diff) | |
| parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-2a171788ba7bb61995e98e8163204fc7880f63b2.tar.xz linux-2a171788ba7bb61995e98e8163204fc7880f63b2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Files removed in 'net-next' had their license header updated
in 'net'. We take the remove from 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/include/asm/swiotlb.h')
| -rw-r--r-- | arch/x86/include/asm/swiotlb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/swiotlb.h b/arch/x86/include/asm/swiotlb.h index d2f69b9ff732..bdf9aed40403 100644 --- a/arch/x86/include/asm/swiotlb.h +++ b/arch/x86/include/asm/swiotlb.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_X86_SWIOTLB_H #define _ASM_X86_SWIOTLB_H |