50 files changed, 49 insertions, 99 deletions

diff --git a/include/linux/tipc.h b/include/linux/tipc.h
index ff109c1c14..243a15f540 100644
--- 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
diff --git a/include/linux/tipc_config.h b/include/linux/tipc_config.h
index 6e5a3af0d2..a52c8c64a5 100644
--- 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
diff --git a/include/net/tipc/tipc.h b/include/net/tipc/tipc.h
index b763d55635..560a329660 100644
--- 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
diff --git a/include/net/tipc/tipc_bearer.h b/include/net/tipc/tipc_bearer.h
index 0cfb9bbd9a..098607cd4b 100644
--- 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
diff --git a/include/net/tipc/tipc_msg.h b/include/net/tipc/tipc_msg.h
index a5c7ed598f..4d096eebc9 100644
--- 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
diff --git a/include/net/tipc/tipc_port.h b/include/net/tipc/tipc_port.h
index db947ff126..3f60274416 100644
--- 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
diff --git a/net/tipc/addr.c b/net/tipc/addr.c
index 89a25a2d03..6d5709deee 100644
--- 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
diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index b65a0ab264..cdf9548604 100644
--- 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
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 180d80b37a..d7d06f29f1 100644
--- 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
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h
index 27d1bba5c9..5430e524b4 100644
--- 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
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 579b17ded6..9c8ab26301 100644
--- 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
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 96d4bd9e76..55197ccf1a 100644
--- 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
diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c
index 4e86b2a6fc..7c31f690c3 100644
--- 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
diff --git a/net/tipc/cluster.h b/net/tipc/cluster.h
index a066b5e518..a9a46fa4fc 100644
--- 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
diff --git a/net/tipc/config.c b/net/tipc/config.c
index 9e55cf8cae..6c45771bd9 100644
--- 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
diff --git a/net/tipc/config.h b/net/tipc/config.h
index a12c6482c9..646377d404 100644
--- 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
diff --git a/net/tipc/core.c b/net/tipc/core.c
index 6d45d71bda..e83ac06e31 100644
--- 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
diff --git a/net/tipc/core.h b/net/tipc/core.h
index 4f71fde023..deee5de5fb 100644
--- 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
diff --git a/net/tipc/dbg.c b/net/tipc/dbg.c
index 22fa030150..3264ccb744 100644
--- 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
diff --git a/net/tipc/dbg.h b/net/tipc/dbg.h
index 07a42ba684..264c741f95 100644
--- 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
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 31e242f39e..b106ef1621 100644
--- 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
diff --git a/net/tipc/discover.h b/net/tipc/discover.h
index 17c150b18d..2a6114d916 100644
--- 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
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 8acbef8e93..fe0a4286e4 100644
--- 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
diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index 8f5dcbd4cd..cab6f61504 100644
--- 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
diff --git a/net/tipc/link.c b/net/tipc/link.c
index c9261002ea..48d0483297 100644
--- 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
diff --git a/net/tipc/link.h b/net/tipc/link.h
index a67868606e..686eb7d684 100644
--- 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
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index acc6e35429..4ffbb9d444 100644
--- 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
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 6323de9743..71e272face 100644
--- 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
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 31448272a1..93ac2b2522 100644
--- 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
diff --git a/net/tipc/name_distr.h b/net/tipc/name_distr.h
index 3f9c28d87c..41c1b1c065 100644
--- 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
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index e152d6dddf..8568df3cc6 100644
--- 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
diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h
index 8e3749cf9b..c771b093e1 100644
--- 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
diff --git a/net/tipc/net.c b/net/tipc/net.c
index 73c6aa8fa1..a6989946e2 100644
--- 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
diff --git a/net/tipc/net.h b/net/tipc/net.h
index 97650ff635..6f0758e894 100644
--- 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
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 7b96383396..c19c2fa2ce 100644
--- 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
diff --git a/net/tipc/node.c b/net/tipc/node.c
index e86614494c..565c35b54c 100644
--- 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
diff --git a/net/tipc/node.h b/net/tipc/node.h
index 8919c873b0..26c04ba2d4 100644
--- 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
diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c
index ecdb982166..f271b61ecc 100644
--- 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
diff --git a/net/tipc/node_subscr.h b/net/tipc/node_subscr.h
index 3d2d8f546e..3145339b55 100644
--- 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
diff --git a/net/tipc/port.c b/net/tipc/port.c
index e69e8b42a1..ea45b17b04 100644
--- 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
diff --git a/net/tipc/port.h b/net/tipc/port.h
index e10d85a4bf..c15f687bd6 100644
--- 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
diff --git a/net/tipc/ref.c b/net/tipc/ref.c
index b6f60822ec..eb5f2b2799 100644
--- 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
diff --git a/net/tipc/ref.h b/net/tipc/ref.h
index 08ba83fd56..12dd827be3 100644
--- 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
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index e0b429c20b..cb90d8a998 100644
--- 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
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index b52959fca5..728f9f073a 100644
--- 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
diff --git a/net/tipc/subscr.h b/net/tipc/subscr.h
index 6b91ca9e24..ccff4efcb7 100644
--- 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
diff --git a/net/tipc/user_reg.c b/net/tipc/user_reg.c
index 64165ec460..37b73e3ba0 100644
--- 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
diff --git a/net/tipc/user_reg.h b/net/tipc/user_reg.h
index 0f96004ebd..3a55c755f1 100644
--- 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
diff --git a/net/tipc/zone.c b/net/tipc/zone.c
index b47deecb73..cb5528699a 100644
--- 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
diff --git a/net/tipc/zone.h b/net/tipc/zone.h
index e05cc61020..2fc5ed71b6 100644
--- 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