diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-02-12 14:08:59 +0100 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-02-12 14:08:59 +0100 |
commit | 74c12ee02af109adcde36ec184fa59c0afb0edaa (patch) | |
tree | dfe4615e0a5e3f8583e685aacdd9a0908e9ffbe3 /drivers/acpi/acpica/actables.h | |
parent | drm/bridge: ti-tfp410: Update drm_connector_init_with_ddc() error message (diff) | |
parent | Linux 5.6-rc1 (diff) | |
download | linux-74c12ee02af109adcde36ec184fa59c0afb0edaa.tar.xz linux-74c12ee02af109adcde36ec184fa59c0afb0edaa.zip |
Merge v5.6-rc1 into drm-misc-fixes
We're based on v5.6, need v5.6-rc1 at least. :)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/acpi/acpica/actables.h')
-rw-r--r-- | drivers/acpi/acpica/actables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h index dfbf1dbd4033..734624facda3 100644 --- a/drivers/acpi/acpica/actables.h +++ b/drivers/acpi/acpica/actables.h @@ -3,7 +3,7 @@ * * Name: actables.h - ACPI table management * - * Copyright (C) 2000 - 2019, Intel Corp. + * Copyright (C) 2000 - 2020, Intel Corp. * *****************************************************************************/ |