summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/dswload.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-05 15:42:08 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-05 15:42:08 +0100
commit38220a5e89389b587647128220cd328a5dc92e42 (patch)
tree3b112a1fcc3828b2dfa9cb8f8d092b3eee4b6e14 /drivers/acpi/acpica/dswload.c
parentACPI / EC: Cleanup QR_EC related code (diff)
parentACPICA: Events: Enable APIs to allow interrupt/polling adaptive request based... (diff)
downloadlinux-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.c2
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