Merge branch 'linus' into tracing/sysprof

[linux-2.6] / drivers / acpi / dispatcher / dsobject.c

diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 7562823b3b764e2c5dc705c04dc67b973fee98a1..1022e38994c2bffcdd8a52d676e9ecf951cc49f7 100644 (file)
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -5,7 +5,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