diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-08 12:13:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-08 12:13:22 +0100 |
| commit | b349e9a916772e867d0f9246d2978799897b2495 (patch) | |
| tree | baebdc1a0c1176198518ba6991fbf42ce4614910 /drivers/acpi/acpica/excreate.c | |
| parent | 7c360572b430a0e9757bafc0c20f26c920f2a07f (diff) | |
| parent | 59fd1214561921343305a0e9dc218bf3d40068f3 (diff) | |
| download | linux-b349e9a916772e867d0f9246d2978799897b2495.tar.gz linux-b349e9a916772e867d0f9246d2978799897b2495.tar.bz2 linux-b349e9a916772e867d0f9246d2978799897b2495.zip | |
Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/acpica/excreate.c')
| -rw-r--r-- | drivers/acpi/acpica/excreate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c index 46be5a276863..bea9612e4720 100644 --- a/drivers/acpi/acpica/excreate.c +++ b/drivers/acpi/acpica/excreate.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 |