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

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

diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index 8f5dcbd4cd3abf8aacb3dbfee35ae6ff520e0a90..f320010f8a656583146acafd93282a160b464838 100644 (file)
--- 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) 2000-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