Merge branch 'devicetree/next' into spi/next

[~andy/linux] / drivers / acpi / acpica / pstree.c

diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c
index d4b970c3630badddb8ea5992cd374b8ffc2379b0..f1464c03aa427865f4601cd01d58712ce7024b39 100644 (file)
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without