[TIPC] Update of file headers

The copyright statements from different parts of Ericsson have been merged into one. Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
2006-01-11 18:40:41 +01:00 · 2006-01-11 18:40:41 +01:00 · 9da1c8b694
commit 9da1c8b694
parent d0a14a9dbd
50 changed files with 49 additions and 99 deletions
--- a/include/linux/tipc.h
+++ b/include/linux/tipc.h
@ -1,9 +1,8 @@
 /*
 * include/linux/tipc.h: Include file for TIPC socket interface
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/linux/tipc_config.h
+++ b/include/linux/tipc_config.h
@ -1,9 +1,8 @@
 /*
 * include/linux/tipc_config.h: Include file for TIPC configuration interface
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/net/tipc/tipc.h
+++ b/include/net/tipc/tipc.h
@ -1,9 +1,8 @@
 /*
 * include/net/tipc/tipc.h: Main include file for TIPC users
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/net/tipc/tipc_bearer.h
+++ b/include/net/tipc/tipc_bearer.h
@ -1,9 +1,8 @@
 /*
 * include/net/tipc/tipc_bearer.h: Include file for privileged access to TIPC bearers
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/net/tipc/tipc_msg.h
+++ b/include/net/tipc/tipc_msg.h
@ -1,9 +1,8 @@
 /*
 * include/net/tipc/tipc_msg.h: Include file for privileged access to TIPC message headers
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/net/tipc/tipc_port.h
+++ b/include/net/tipc/tipc_port.h
@ -1,9 +1,8 @@
 /*
 * include/net/tipc/tipc_port.h: Include file for privileged access to TIPC ports
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/addr.c: TIPC address utility routines
 *     
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/addr.h: Include file for TIPC address utility routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@ -1,10 +1,9 @@
 /*
 * net/tipc/bcast.c: TIPC broadcast code
 *     
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004, Intel Corporation.
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/bcast.h: Include file for TIPC broadcast code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/bearer.c: TIPC bearer code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/bearer.h: Include file for TIPC bearer code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/cluster.c
+++ b/net/tipc/cluster.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/cluster.c: TIPC cluster management routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/cluster.h
+++ b/net/tipc/cluster.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/cluster.h: Include file for TIPC cluster management routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/config.c: TIPC configuration management code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/config.h
+++ b/net/tipc/config.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/config.h: Include file for TIPC configuration service code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/core.c: TIPC module code
 *
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/core.h: Include file for TIPC global declarations
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/dbg.c
+++ b/net/tipc/dbg.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/dbg.c: TIPC print buffer routines for debuggign
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/dbg.h
+++ b/net/tipc/dbg.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/dbg.h: Include file for TIPC print buffer routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/discover.c
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/discover.h
+++ b/net/tipc/discover.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/discover.h
 *
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/eth_media.c: Ethernet bearer support for TIPC
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/handler.c: TIPC signal handling
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/link.c: TIPC link code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/link.h: Include file for TIPC link code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/msg.c: TIPC message header routines
 *     
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/msg.h: Include file for TIPC message header routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/name_distr.c: TIPC name distribution code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/name_distr.h
+++ b/net/tipc/name_distr.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/name_distr.h: Include file for TIPC name distribution code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/name_table.c: TIPC name table code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/name_table.h
+++ b/net/tipc/name_table.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/name_table.h: Include file for TIPC name table code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/net.c: TIPC network routing code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/net.h: Include file for TIPC network routing code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@ -2,7 +2,6 @@
 * net/tipc/netlink.c: TIPC configuration handling
 * 
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/node.c: TIPC node management routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/node.h: Include file for TIPC node management routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/node_subscr.c
+++ b/net/tipc/node_subscr.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/node_subscr.c: TIPC "node down" subscription handling
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/node_subscr.h
+++ b/net/tipc/node_subscr.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/node_subscr.h: Include file for TIPC "node down" subscription handling
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/port.c: TIPC port code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/port.h: Include file for TIPC port code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/ref.c
+++ b/net/tipc/ref.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/ref.c: TIPC object registry code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/ref.h
+++ b/net/tipc/ref.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/ref.h: Include file for TIPC object registry code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/socket.c: TIPC socket API
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/subscr.c: TIPC subscription service
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/subscr.h
+++ b/net/tipc/subscr.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/subscr.h: Include file for TIPC subscription service
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/user_reg.c
+++ b/net/tipc/user_reg.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/user_reg.c: TIPC user registry code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2004-2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/user_reg.h
+++ b/net/tipc/user_reg.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/user_reg.h: Include file for TIPC user registry code
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/zone.c
+++ b/net/tipc/zone.c
@ -1,9 +1,8 @@
 /*
 * net/tipc/zone.c: TIPC zone management routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/net/tipc/zone.h
+++ b/net/tipc/zone.h
@ -1,9 +1,8 @@
 /*
 * net/tipc/zone.h: Include file for TIPC zone management routines
 * 
- * Copyright (c) 2003-2005, Ericsson Research Canada
+ * Copyright (c) 2003-2006, Ericsson AB
 * Copyright (c) 2005, Wind River Systems
- * Copyright (c) 2005-2006, Ericsson AB
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without