summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Liden <per.liden@nospam.ericsson.com>2006-01-11 18:40:41 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 14:06:38 -0800
commit9da1c8b694f8e72a16f259614caaae50cbcdaf10 (patch)
treeefaa58a8332e0ddc2274a4843de1a1ead75fb52d
parentd0a14a9dbdf613d9307c4b748b03a11678fe8d16 (diff)
downloadop-kernel-dev-9da1c8b694f8e72a16f259614caaae50cbcdaf10.zip
op-kernel-dev-9da1c8b694f8e72a16f259614caaae50cbcdaf10.tar.gz
[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>
-rw-r--r--include/linux/tipc.h3
-rw-r--r--include/linux/tipc_config.h3
-rw-r--r--include/net/tipc/tipc.h3
-rw-r--r--include/net/tipc/tipc_bearer.h3
-rw-r--r--include/net/tipc/tipc_msg.h3
-rw-r--r--include/net/tipc/tipc_port.h3
-rw-r--r--net/tipc/addr.c3
-rw-r--r--net/tipc/addr.h3
-rw-r--r--net/tipc/bcast.c3
-rw-r--r--net/tipc/bcast.h3
-rw-r--r--net/tipc/bearer.c3
-rw-r--r--net/tipc/bearer.h3
-rw-r--r--net/tipc/cluster.c3
-rw-r--r--net/tipc/cluster.h3
-rw-r--r--net/tipc/config.c3
-rw-r--r--net/tipc/config.h3
-rw-r--r--net/tipc/core.c3
-rw-r--r--net/tipc/core.h3
-rw-r--r--net/tipc/dbg.c3
-rw-r--r--net/tipc/dbg.h3
-rw-r--r--net/tipc/discover.c3
-rw-r--r--net/tipc/discover.h3
-rw-r--r--net/tipc/eth_media.c3
-rw-r--r--net/tipc/handler.c3
-rw-r--r--net/tipc/link.c3
-rw-r--r--net/tipc/link.h3
-rw-r--r--net/tipc/msg.c3
-rw-r--r--net/tipc/msg.h3
-rw-r--r--net/tipc/name_distr.c3
-rw-r--r--net/tipc/name_distr.h3
-rw-r--r--net/tipc/name_table.c3
-rw-r--r--net/tipc/name_table.h3
-rw-r--r--net/tipc/net.c3
-rw-r--r--net/tipc/net.h3
-rw-r--r--net/tipc/netlink.c1
-rw-r--r--net/tipc/node.c3
-rw-r--r--net/tipc/node.h3
-rw-r--r--net/tipc/node_subscr.c3
-rw-r--r--net/tipc/node_subscr.h3
-rw-r--r--net/tipc/port.c3
-rw-r--r--net/tipc/port.h3
-rw-r--r--net/tipc/ref.c3
-rw-r--r--net/tipc/ref.h3
-rw-r--r--net/tipc/socket.c3
-rw-r--r--net/tipc/subscr.c3
-rw-r--r--net/tipc/subscr.h3
-rw-r--r--net/tipc/user_reg.c3
-rw-r--r--net/tipc/user_reg.h3
-rw-r--r--net/tipc/zone.c3
-rw-r--r--net/tipc/zone.h3
50 files changed, 49 insertions, 99 deletions
diff --git a/include/linux/tipc.h b/include/linux/tipc.h
index ff109c1..243a15f 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 6e5a3af..a52c8c6 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 b763d55..560a329 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 0cfb9bb..098607c 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 a5c7ed5..4d096ee 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 db947ff..3f60274 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 89a25a2..6d5709d 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 b65a0ab..cdf9548 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 180d80b..d7d06f2 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 27d1bba..5430e52 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 579b17d..9c8ab26 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 96d4bd9..55197cc 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 4e86b2a..7c31f69 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 a066b5e..a9a46fa 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 9e55cf8..6c45771 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 a12c648..646377d 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 6d45d71..e83ac06 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 4f71fde..deee5de 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 22fa030..3264ccb 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 07a42ba..264c741 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 31e242f..b106ef1 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 17c150b..2a6114d 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 8acbef8..fe0a428 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 8f5dcbd..cab6f61 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 c926100..48d0483 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 a678686..686eb7d 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 acc6e35..4ffbb9d 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 6323de9..71e272f 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 3144827..93ac2b2 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 3f9c28d..41c1b1c 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 e152d6d..8568df3 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 8e3749c..c771b09 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 73c6aa8..a698994 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 97650ff..6f0758e 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 7b96383..c19c2fa 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 e866144..565c35b5 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 8919c87..26c04ba2 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 ecdb982..f271b61 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 3d2d8f5..3145339 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 e69e8b4..ea45b17 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 e10d85a4..c15f687 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 b6f6082..eb5f2b2 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 08ba83f..12dd827 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 e0b429c..cb90d8a 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 b52959f..728f9f0 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 6b91ca9..ccff4ef 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 64165ec..37b73e3 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 0f96004..3a55c75 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 b47deec..cb55286 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 e05cc61..2fc5ed7 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
OpenPOWER on IntegriCloud