summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/psobject.c
diff options
context:
space:
mode:
authorRafael J. Wysocki2018-02-08 11:26:07 +0100
committerRafael J. Wysocki2018-02-08 11:26:07 +0100
commitb1738e3ebac570a647648a679a54c033813beb68 (patch)
tree2720050a1c88d085af74956c2f63c4c82cab3237 /drivers/acpi/acpica/psobject.c
parentACPI: sbshc: remove raw pointer from printk() message (diff)
parentACPICA: Update version to 20180105 (diff)
downloadkernel-qcow2-linux-b1738e3ebac570a647648a679a54c033813beb68.tar.gz
kernel-qcow2-linux-b1738e3ebac570a647648a679a54c033813beb68.tar.xz
kernel-qcow2-linux-b1738e3ebac570a647648a679a54c033813beb68.zip
Merge branch 'acpica'
* acpica: ACPICA: Update version to 20180105 ACPICA: All acpica: Update copyrights to 2018 ACPICA: Add a missing pair of parentheses ACPICA: Prefer ACPI_TO_POINTER() over ACPI_ADD_PTR() ACPICA: Avoid NULL pointer arithmetic ACPICA: Linux: add support for X32 ABI compilation
Diffstat (limited to 'drivers/acpi/acpica/psobject.c')
-rw-r--r--drivers/acpi/acpica/psobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c
index c0b179883ff2..b18f1e048985 100644
--- a/drivers/acpi/acpica/psobject.c
+++ b/drivers/acpi/acpica/psobject.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2017, Intel Corp.
+ * Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without