diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /drivers/acpi/acpica/acparser.h | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'drivers/acpi/acpica/acparser.h')
| -rw-r--r-- | drivers/acpi/acpica/acparser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h index d0bb0fd3e57a..5ea1e06afa20 100644 --- a/drivers/acpi/acpica/acparser.h +++ b/drivers/acpi/acpica/acparser.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (C) 2000 - 2010, Intel Corp. | 8 | * Copyright (C) 2000 - 2011, Intel Corp. |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * | 10 | * |
| 11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |