summaryrefslogtreecommitdiff
path: root/tools/power/acpi/os_specific/service_layers/osunixmap.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-02-21 11:57:55 +0300
committerIngo Molnar <mingo@kernel.org>2018-02-21 11:57:55 +0300
commit862e6e2a609197f41bc04420b31ff122be9f870f (patch)
tree216db312f37d0eb5ea2e6cb3ab742f97e83ea7ff /tools/power/acpi/os_specific/service_layers/osunixmap.c
parenta1ea544fe0911492b9f8d101bcbf46cc8c47fbc5 (diff)
parent91ab883eb21325ad80f3473633f794c78ac87f51 (diff)
downloadlinux-862e6e2a609197f41bc04420b31ff122be9f870f.tar.xz
Merge tag 'v4.16-rc2' into locking/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/power/acpi/os_specific/service_layers/osunixmap.c')
-rw-r--r--tools/power/acpi/os_specific/service_layers/osunixmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/acpi/os_specific/service_layers/osunixmap.c b/tools/power/acpi/os_specific/service_layers/osunixmap.c
index cf9b5a54df92..8b26924e2602 100644
--- a/tools/power/acpi/os_specific/service_layers/osunixmap.c
+++ b/tools/power/acpi/os_specific/service_layers/osunixmap.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