Merge commit 'v2.6.26-rc9' into cpus4096

[linux-2.6] / drivers / acpi / executer / exoparg6.c

diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index 163b2b3d9ce2d4b10058fd71d2612fd8dde1ad27..67d48737af5360011b7facec5aa909d62f2d9425 100644 (file)
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without