Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / acpi / parser / pstree.c

diff --git a/drivers/acpi/parser/pstree.c b/drivers/acpi/parser/pstree.c
index 0e1a3226665d59da6bcf9309b9169e2b4cbfe645..1dd355ddd182da6b2a903b3579589e23564cb35d 100644 (file)
--- a/drivers/acpi/parser/pstree.c
+++ b/drivers/acpi/parser/pstree.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