diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 16:25:02 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 16:25:02 +0400 |
| commit | 6ac4a2ab16af49a86ad16bdab1de72d5b809a9c1 (patch) | |
| tree | 6cdaa76dbcdfe070e293b3d6ab4c78649c8ed059 /drivers/acpi/acpica/nsxfeval.c | |
| parent | 94a81caca3757a2eda026cbd592db8e321fcba43 (diff) | |
| parent | 6e596084833b95662dfe90e1f30d83ccbd64575c (diff) | |
| download | linux-6ac4a2ab16af49a86ad16bdab1de72d5b809a9c1.tar.xz | |
Merge branch 'acpica'
* acpica: (29 commits)
ACPICA: Revert "Headers: Deploy #pragma pack (push) and (pop)."
ACPICA: Update version to 20140214.
ACPICA: Prevent infinite loops when traversing corrupted lists.
ACPICA: Debugger: Add missing objects; Traverse linked lists
ACPICA: Add text: ACPICA policy for new _OSI strings. No functional change.
ACPICA: Update for _PRP predefined name.
ACPICA: Cleanup/improve global variable declarations.
ACPICA: Comment update - no functional change.
ACPICA: Do not abort _PRT repair on a single subpackage failure.
ACPICA: Harden _PRT repair code; check for minimum package length.
ACPICA: Restore code that repairs NULL package elements in return values.
ACPICA: Properly handle NULL entries in _PRT return packages.
ACPICA: Update conditional compilation flags for resource dump functions.
ACPICA: Predefined names: Add support for the _PRP method.
ACPICA: Headers: Deploy #pragma pack (push) and (pop).
ACPICA: Add boot option to disable auto return object repair
ACPICA: acpidump: Remove integer types translation protection.
ACPICA: acpidump: Add sparse declarators support.
ACPICA: Add "Windows 2013" string to _OSI support.
ACPICA: Update version to 20140114.
...
Diffstat (limited to 'drivers/acpi/acpica/nsxfeval.c')
| -rw-r--r-- | drivers/acpi/acpica/nsxfeval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c index d6b33bc7bab0..4bd558bf10d2 100644 --- a/drivers/acpi/acpica/nsxfeval.c +++ b/drivers/acpi/acpica/nsxfeval.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2013, Intel Corp. + * Copyright (C) 2000 - 2014, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |