diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-02-03 17:49:49 -0500 |
|---|---|---|
| committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-02-03 17:49:49 -0500 |
| commit | 01d206a7c1167639f6ca6dac22140fbdca017558 (patch) | |
| tree | bc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2 /include/acpi/actables.h | |
| parent | 9c4b562abc9005e4b413de02c85d3d29da707cba (diff) | |
| parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/acpi/actables.h')
| -rw-r--r-- | include/acpi/actables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/actables.h b/include/acpi/actables.h index f92c1858b808..30a47542e1c8 100644 --- a/include/acpi/actables.h +++ b/include/acpi/actables.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (C) 2000 - 2005, R. Byron Moore | 8 | * Copyright (C) 2000 - 2006, R. Byron Moore |
| 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 |