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/arm/mach-pxa/include/mach/uncompress.h | |
| 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/arm/mach-pxa/include/mach/uncompress.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/uncompress.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h index 8c27757e68ff..c36306064eee 100644 --- a/arch/arm/mach-pxa/include/mach/uncompress.h +++ b/arch/arm/mach-pxa/include/mach/uncompress.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * arch/arm/mach-pxa/include/mach/uncompress.h * * Author: Nicolas Pitre * Copyright: (C) 2001 MontaVista Software Inc. - * - * 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/serial_reg.h> |