Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index c9228972f5f65a08a1ed6bb464dc255d9413c362..9e60732658734c4c1741f32c3eb1ff236da20e61 100644 (file)
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without