summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/rsutils.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-02-01 08:16:22 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-02-01 08:16:22 +0300
commita1f3d4bba8ea395a39d34ade6017afee8be16031 (patch)
tree874d843d35622f17aa6c3e048e42cf0d679bcb75 /drivers/acpi/acpica/rsutils.c
parent723d928417bffff6467da155d8ebbbe016464012 (diff)
parentebf53826e105f488f4f628703a108e98940d1dc5 (diff)
downloadlinux-a1f3d4bba8ea395a39d34ade6017afee8be16031.tar.xz
Merge commit 'v2.6.38-rc3' into next
Diffstat (limited to 'drivers/acpi/acpica/rsutils.c')
-rw-r--r--drivers/acpi/acpica/rsutils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index 491191e6cf69..231811e56939 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -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