From 26f34914769a97bc106924c0a7b428a0df1fa058 Mon Sep 17 00:00:00 2001
From: Frans Pop <elendil@planet.nl>
Date: Wed, 24 Mar 2010 07:57:29 +0000
Subject: [PATCH] --- yaml --- r: 193779 b: refs/heads/master c:
 a570f095eac34b7439eed2df6728381708c55bdc h: refs/heads/master i:   193777:
 29909fe927059d06116b80b939bfb423313d22e0   193775:
 f96ede8fd6f3158a85524da3f8a22007c7b0b347 v: v3

---
 [refs]                | 2 +-
 trunk/net/tipc/link.c | 8 ++++----
 trunk/net/tipc/net.c  | 2 +-
 trunk/net/tipc/node.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6b07bfd75cb2..3793508ed0d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b138338056fc423c61a583d45f8aa64cfad87131
+refs/heads/master: a570f095eac34b7439eed2df6728381708c55bdc
diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c
index 49f2be8622a9..c76e82e5f982 100644
--- a/trunk/net/tipc/link.c
+++ b/trunk/net/tipc/link.c
@@ -877,7 +877,7 @@ static void link_state_event(struct link *l_ptr, unsigned event)
 		case TIMEOUT_EVT:
 			dbg_link("TIM ");
 			if (l_ptr->next_in_no != l_ptr->checkpoint) {
-				dbg_link("-> WW \n");
+				dbg_link("-> WW\n");
 				l_ptr->state = WORKING_WORKING;
 				l_ptr->fsm_msg_cnt = 0;
 				l_ptr->checkpoint = l_ptr->next_in_no;
@@ -934,7 +934,7 @@ static void link_state_event(struct link *l_ptr, unsigned event)
 			link_set_timer(l_ptr, cont_intv);
 			break;
 		case RESET_MSG:
-			dbg_link("RES \n");
+			dbg_link("RES\n");
 			dbg_link(" -> RR\n");
 			l_ptr->state = RESET_RESET;
 			l_ptr->fsm_msg_cnt = 0;
@@ -947,7 +947,7 @@ static void link_state_event(struct link *l_ptr, unsigned event)
 			l_ptr->started = 1;
 			/* fall through */
 		case TIMEOUT_EVT:
-			dbg_link("TIM \n");
+			dbg_link("TIM\n");
 			tipc_link_send_proto_msg(l_ptr, RESET_MSG, 0, 0, 0, 0, 0);
 			l_ptr->fsm_msg_cnt++;
 			link_set_timer(l_ptr, cont_intv);
@@ -3295,7 +3295,7 @@ static void link_dump_rec_queue(struct link *l_ptr)
 			info("buffer %x invalid\n", crs);
 			return;
 		}
-		msg_dbg(buf_msg(crs), "In rec queue: \n");
+		msg_dbg(buf_msg(crs), "In rec queue:\n");
 		crs = crs->next;
 	}
 }
diff --git a/trunk/net/tipc/net.c b/trunk/net/tipc/net.c
index f25b1cdb64eb..79ce8fa2b77a 100644
--- a/trunk/net/tipc/net.c
+++ b/trunk/net/tipc/net.c
@@ -291,6 +291,6 @@ void tipc_net_stop(void)
 	tipc_bclink_stop();
 	net_stop();
 	write_unlock_bh(&tipc_net_lock);
-	info("Left network mode \n");
+	info("Left network mode\n");
 }
 
diff --git a/trunk/net/tipc/node.c b/trunk/net/tipc/node.c
index 2c24e7d6d950..17cc394f424f 100644
--- a/trunk/net/tipc/node.c
+++ b/trunk/net/tipc/node.c
@@ -278,7 +278,7 @@ struct tipc_node *tipc_node_attach_link(struct link *l_ptr)
 			n_ptr->link_cnt++;
 			return n_ptr;
 		}
-		err("Attempt to establish second link on <%s> to %s \n",
+		err("Attempt to establish second link on <%s> to %s\n",
 		    l_ptr->b_ptr->publ.name,
 		    addr_string_fill(addr_string, l_ptr->addr));
 	}