Merge branch 'linus' into core/softlockup

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

diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index aef8db82570afb5e3ae1ee0125662abca5a0b498..3e440d84226a4e85aea18a5b49156145e1bfbfd7 100644 (file)
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.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