summaryrefslogtreecommitdiffstats
path: root/include/acpi/acoutput.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-31 06:55:14 +0200
committerDave Airlie <airlied@redhat.com>2010-03-31 06:55:14 +0200
commit3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch)
tree15671ed8bd3597d2efe13aa57b755c66014acb57 /include/acpi/acoutput.h
parentdrm/radeon/kms: disable MSI on IGP chips (diff)
parentLinux 2.6.34-rc2 (diff)
downloadlinux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.tar.xz
linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.zip
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'include/acpi/acoutput.h')
-rw-r--r--include/acpi/acoutput.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index d814da4b5365..d7726685797e 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.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