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-omap2/omap_hwmod_7xx_data.c | |
| 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-omap2/omap_hwmod_7xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index 7e85bd27ce9a..4a5b4aee6615 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Hardware modules present on the DRA7xx chips * @@ -11,10 +12,6 @@ * with the public linux-omap@vger.kernel.org mailing list and the * authors above to ensure that the autogeneration scripts are kept * up-to-date with the file contents. - * - * 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/io.h> |