diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-10 18:02:37 +0300 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-10 18:02:37 +0300 |
commit | fad837c16cdd856c68ce2e1335ad0fe836ed8ecd (patch) | |
tree | 1a6babdc2ac7e5388c482e93505fdfaf5ff97f61 /include/acpi/acexcep.h | |
parent | 51c6ab130642ed975681df843c772dda48a1d2ed (diff) | |
parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
download | linux-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.tar.xz |
Merge commit 'v2.6.34-rc1' into for-2.6.35
Diffstat (limited to 'include/acpi/acexcep.h')
-rw-r--r-- | include/acpi/acexcep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index 473d584b1d31..5b2e5e80ecb0 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2008, Intel Corp. + * Copyright (C) 2000 - 2010, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |