summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/exdebug.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-06 20:37:42 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-06 20:37:42 +0300
commitcebeb0f1885fa93c44be5d4e0b9b640210ff088c (patch)
treea33e4af4ddaa7a57f997ab9a2baceb48209670cd /drivers/acpi/acpica/exdebug.c
parent939ecf6b14c46e3448411a934418311b492bfee4 (diff)
parent48d11dc37977614a461bfedddc52d1c651bc279f (diff)
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
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 81c72a4ecd823..4cfc3d3b5c97d 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without