diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-05 15:42:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-05 15:42:08 +0100 |
| commit | 38220a5e89389b587647128220cd328a5dc92e42 (patch) | |
| tree | 3b112a1fcc3828b2dfa9cb8f8d092b3eee4b6e14 /drivers/acpi/acpica/dsargs.c | |
| parent | 550b3aac5a72c4209f1ad3bc0ade663d5cb36f7f (diff) | |
| parent | 2eedd3d8398b266ee8e846ded03218bb6a00e2c1 (diff) | |
| download | blackbird-op-linux-38220a5e89389b587647128220cd328a5dc92e42.tar.gz blackbird-op-linux-38220a5e89389b587647128220cd328a5dc92e42.zip | |
Merge branch 'acpica' into acpi-ec
Diffstat (limited to 'drivers/acpi/acpica/dsargs.c')
| -rw-r--r-- | drivers/acpi/acpica/dsargs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dsargs.c b/drivers/acpi/acpica/dsargs.c index 720b1cdda711..3e6989738e85 100644 --- a/drivers/acpi/acpica/dsargs.c +++ b/drivers/acpi/acpica/dsargs.c @@ -6,7 +6,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 |
