diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-16 04:32:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-16 04:33:01 +1000 |
| commit | f6ac3a68496efc5f1b6d2b0a2101fba03b0ab94f (patch) | |
| tree | 0fa9edf1b9dac68f5a94fb013b31e0ac6ba4183a /arch/arc/lib/memset.S | |
| parent | 3729fe2bc2a01f4cc1aa88be8f64af06084c87d6 (diff) | |
| parent | fec88ab0af9706b2201e5daf377c5031c62d11f7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-nextdrm-next-5.3-backmerge-conflicts
Example backmerge for Linus
Diffstat (limited to 'arch/arc/lib/memset.S')
| -rw-r--r-- | arch/arc/lib/memset.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arc/lib/memset.S b/arch/arc/lib/memset.S index cf736f9aa403..9f35960da114 100644 --- a/arch/arc/lib/memset.S +++ b/arch/arc/lib/memset.S @@ -1,9 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2004, 2007-2010, 2011-2012 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/linkage.h> |