summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exdebug.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/exdebug.c
parent550b3aac5a72c4209f1ad3bc0ade663d5cb36f7f (diff)
parent2eedd3d8398b266ee8e846ded03218bb6a00e2c1 (diff)
downloadlinux-38220a5e89389b587647128220cd328a5dc92e42.tar.bz2
Merge branch 'acpica' into acpi-ec
Diffstat (limited to 'drivers/acpi/acpica/exdebug.c')
-rw-r--r--drivers/acpi/acpica/exdebug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index 6fbfad47518c..e67d0aca3fe6 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.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