summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpi.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-02-06 13:43:13 +0100
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-06 13:43:13 +0100
commitb2faf597d93bdf5e2d12d93ea0815935a73f749e (patch)
tree1876616290ff282b8a0814e2429d23e0104f3701 /include/acpi/acpi.h
parentMerge branch 'origin' (diff)
parent[PATCH] USB: Fix GPL markings on usb core functions. (diff)
downloadlinux-b2faf597d93bdf5e2d12d93ea0815935a73f749e.tar.xz
linux-b2faf597d93bdf5e2d12d93ea0815935a73f749e.zip
Merge branch 'origin'
Diffstat (limited to 'include/acpi/acpi.h')
-rw-r--r--include/acpi/acpi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h
index ccf34f9dac64..b9a39d1009bd 100644
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without