diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-05 15:42:08 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-05 15:42:08 +0100 |
commit | 38220a5e89389b587647128220cd328a5dc92e42 (patch) | |
tree | 3b112a1fcc3828b2dfa9cb8f8d092b3eee4b6e14 /drivers/acpi/acpica/dswload.c | |
parent | ACPI / EC: Cleanup QR_EC related code (diff) | |
parent | ACPICA: Events: Enable APIs to allow interrupt/polling adaptive request based... (diff) | |
download | linux-38220a5e89389b587647128220cd328a5dc92e42.tar.xz linux-38220a5e89389b587647128220cd328a5dc92e42.zip |
Merge branch 'acpica' into acpi-ec
Diffstat (limited to 'drivers/acpi/acpica/dswload.c')
-rw-r--r-- | drivers/acpi/acpica/dswload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c index 15623da26200..843942fb4be5 100644 --- a/drivers/acpi/acpica/dswload.c +++ b/drivers/acpi/acpica/dswload.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |