Merge branch 'linus' into x86/amd-iommu

[linux-2.6] / drivers / acpi / namespace / nssearch.c

diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index d261c9bcd4508c7485d0e7757ffda48944d25db6..8399276cba1e4049155ffd7229e9c06b4fdad8c9 100644 (file)
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.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