Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / net / tipc / node_subscr.c

diff --git a/net/tipc/node_subscr.c b/net/tipc/node_subscr.c
index ecdb982166871a4d80efd19e78ee6c206fcfd263..79375927916f7d10e58d1ac2f5763dfa22c336ef 100644 (file)
--- 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) 1995-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