summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/acparser.h
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-03-10 01:22:08 +0300
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-03-10 01:22:08 +0300
commite739cf1da48e841bc5d744a99764c1a668b4bdd2 (patch)
tree1d39318bbbcdd66ad8cd34823ad9befb7af08b1f /drivers/acpi/acpica/acparser.h
parente7b184f199fd3c80b618ec8244cbda70857d2779 (diff)
parent57d54889cd00db2752994b389ba714138652e60c (diff)
downloadlinux-e739cf1da48e841bc5d744a99764c1a668b4bdd2.tar.xz
Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
Diffstat (limited to 'drivers/acpi/acpica/acparser.h')
-rw-r--r--drivers/acpi/acpica/acparser.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index 22881e8ce229..d0bb0fd3e57a 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.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