diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-22 14:59:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-22 14:59:24 +0200 |
| commit | 92ad6325cb891bb455487bfe90cc47d18aa6ec37 (patch) | |
| tree | 433a7ef938fae69789216043f67eff9f9c6b0c68 /arch/c6x/include/asm/dscr.h | |
| parent | Merge branch 'PCI-let-pci_disable_link_state-propagate-errors' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-92ad6325cb891bb455487bfe90cc47d18aa6ec37.tar.xz linux-92ad6325cb891bb455487bfe90cc47d18aa6ec37.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor SPDX change conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/c6x/include/asm/dscr.h')
| -rw-r--r-- | arch/c6x/include/asm/dscr.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/c6x/include/asm/dscr.h b/arch/c6x/include/asm/dscr.h index 561ba8332042..f6b095c3d3f5 100644 --- a/arch/c6x/include/asm/dscr.h +++ b/arch/c6x/include/asm/dscr.h @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2011 Texas Instruments Incorporated * Author: Mark Salter <msalter@redhat.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * */ #ifndef _ASM_C6X_DSCR_H #define _ASM_C6X_DSCR_H |