diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-19 10:28:10 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-19 10:28:38 +0300 |
| commit | 8ee795625665208589a97972b01790bb04ea83e3 (patch) | |
| tree | b181d0952c23dbf4fe5b293e778424bad271bbfb /drivers/gpu/drm/nouveau/nouveau_acpi.h | |
| parent | 9fb7dc73b923ef5e9251ee7c58239a790720904c (diff) | |
| parent | 4d352dbd5850bfc752609d46b5c8403ae0bd5163 (diff) | |
| download | linux-8ee795625665208589a97972b01790bb04ea83e3.tar.xz | |
Merge branch 'linux-5.3' of git://github.com/skeggsb/linux into drm-next
nouveau fixes and TU116 enablement.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5hZ3B4S9cVTPd2-Ug7dMSasLPJrWMyoDo4MOg8cbXWkA@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_acpi.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.h b/drivers/gpu/drm/nouveau/nouveau_acpi.h index b86294fc99e8..1e6e8a8c0455 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.h +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ #ifndef __NOUVEAU_ACPI_H__ #define __NOUVEAU_ACPI_H__ |