Merge https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / acpica / acglobal.h

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 7f60582d0c8ce1c99bdeca6ba30b647574c33beb..a165d25343e8d535afa1b3456aeda7a667b7a8c9 100644 (file)
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -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