diff options
| author |   Gustavo Padovan <gustavo.padovan@collabora.com> | 2017-12-04 16:04:45 -0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.com> | 2017-12-04 16:04:45 -0200 |
| commit | 7b47c66cfa203288c43851260edeeb0fae56f692 (patch) | |
| tree | fa729735fdaf1d77fbbf13062fd53c31b59d682d /include/linux/timerqueue.h | |
| parent | drm/prime: skip CPU sync in map/unmap dma_buf (diff) | |
| parent | Merge tag 'drm-intel-next-2017-11-17-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
Merge arlied/drm-next into drm-misc-next
We need to pull 66660d4cf21b (drm: add connector info/property for
non-desktop displays [v2]) into drm-misc-next to continue the development
of the display rotation series.
Effectively this also pulls 4.15-r2 into drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'include/linux/timerqueue.h')
| -rw-r--r-- | include/linux/timerqueue.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h index 7eec17ad7fa1..78b8cc73f12f 100644 --- a/include/linux/timerqueue.h +++ b/include/linux/timerqueue.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_TIMERQUEUE_H #define _LINUX_TIMERQUEUE_H |