Merge branch 'for-next' into for-linus

[karo-tx-linux.git] / drivers / acpi / acpica / nsxfobj.c

diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index 0cc6ba01a49543c27eb669fdf662f8db31a587d5..eafef24ea448f9f78884c09d853bb8da1244cb41 100644 (file)
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -6,7 +6,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