diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-06-19 12:32:13 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-06-19 12:32:13 +0200 |
| commit | bcb7416e3480c1abb46266bdab874b3b3d6124cb (patch) | |
| tree | 9d889b14957c0e266697d0674675bc42b0899571 /arch/x86/entry/vdso/vclock_gettime.c | |
| parent | 90b2df5743cd92f4525f662e8f12a536dfb58557 (diff) | |
| parent | 52d2d44eee8091e740d0d275df1311fb8373c9a9 (diff) | |
| download | talos-op-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.tar.gz talos-op-linux-bcb7416e3480c1abb46266bdab874b3b3d6124cb.zip | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh
backmerge of drm-next to pull it in.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'arch/x86/entry/vdso/vclock_gettime.c')
| -rw-r--r-- | arch/x86/entry/vdso/vclock_gettime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/vdso/vclock_gettime.c b/arch/x86/entry/vdso/vclock_gettime.c index 98c7d12b945c..0f82a70c7682 100644 --- a/arch/x86/entry/vdso/vclock_gettime.c +++ b/arch/x86/entry/vdso/vclock_gettime.c @@ -1,6 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright 2006 Andi Kleen, SUSE Labs. - * Subject to the GNU Public License, v.2 * * Fast user context implementation of clock_gettime, gettimeofday, and time. * |
