summaryrefslogtreecommitdiffstats
path: root/include/acpi/actbl.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-24 22:17:06 +0100
committerDavid S. Miller <davem@davemloft.net>2011-01-24 22:17:06 +0100
commite92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch)
tree6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /include/acpi/actbl.h
parentnet: arp_ioctl() must hold RTNL (diff)
parentfix a shutdown regression in intel_idle (diff)
downloadlinux-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.tar.xz
linux-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/acpi/actbl.h')
-rw-r--r--include/acpi/actbl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index ad2001683ba7..7e42bfee0e29 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without