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

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

diff --git a/net/tipc/user_reg.c b/net/tipc/user_reg.c
index 64165ec46043b002ddd313faa056382e8156535a..35ec7dc8211da8dc234922790c752f65f5e635be 100644 (file)
--- 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) 2000-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