diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /include/video/display_timing.h | |
parent | iommu/dma: Fix condition check in iommu_dma_unmap_sg (diff) | |
parent | Linux 5.2-rc6 (diff) | |
download | linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.tar.xz linux-ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5.zip |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'include/video/display_timing.h')
-rw-r--r-- | include/video/display_timing.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/video/display_timing.h b/include/video/display_timing.h index 3d289e990aca..37a017607d1f 100644 --- a/include/video/display_timing.h +++ b/include/video/display_timing.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de> * * description of display timings - * - * This file is released under the GPLv2 */ #ifndef __LINUX_DISPLAY_TIMING_H |