diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-29 09:41:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-29 09:41:18 +0100 |
| commit | 76b36fa896a2db64582690e085f36adc76604134 (patch) | |
| tree | 78007f123ead6f96cdee6ba98ac3c289c706cc39 /drivers/acpi/acpica/uteval.c | |
| parent | x86/asm: Remove unused L3_PAGE_OFFSET (diff) | |
| parent | Linux 4.5-rc1 (diff) | |
| download | linux-76b36fa896a2db64582690e085f36adc76604134.tar.xz linux-76b36fa896a2db64582690e085f36adc76604134.zip | |
Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/acpica/uteval.c')
| -rw-r--r-- | drivers/acpi/acpica/uteval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c index 6c738fa0cd42..17b9f3e6e1e1 100644 --- a/drivers/acpi/acpica/uteval.c +++ b/drivers/acpi/acpica/uteval.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2015, Intel Corp. + * Copyright (C) 2000 - 2016, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |