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/arc/mm/highmem.c | |
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/arc/mm/highmem.c')
-rw-r--r-- | arch/arc/mm/highmem.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c index 11f57e2ced8a..a4856bfaedf3 100644 --- a/arch/arc/mm/highmem.c +++ b/arch/arc/mm/highmem.c @@ -1,10 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2015 Synopsys, Inc. (www.synopsys.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. - * */ #include <linux/memblock.h> |