From 9aa9af5856c3bf368de649878885dd999246bbc8 Mon Sep 17 00:00:00 2001
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Tue, 14 Aug 2007 13:22:58 -0700
Subject: [PATCH] --- yaml --- r: 64067 b: refs/heads/master c:
 02f44315dc4bce8a222564aa023c965efbeb73b5 h: refs/heads/master i:   64065:
 2b9fd7dda2443dbc266ddbb64f18514edeea7dcd   64063:
 4805df03a5afea56554b80ed348f08baa5594eb7 v: v3

---
 [refs]                       | 2 +-
 trunk/net/bridge/br_stp_if.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dad692673ae6..421cda23a8ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17120889b0706b69ae24cba3ef0a340dc3fb7edc
+refs/heads/master: 02f44315dc4bce8a222564aa023c965efbeb73b5
diff --git a/trunk/net/bridge/br_stp_if.c b/trunk/net/bridge/br_stp_if.c
index 1ea2f86f7683..1a430eccec9b 100644
--- a/trunk/net/bridge/br_stp_if.c
+++ b/trunk/net/bridge/br_stp_if.c
@@ -132,7 +132,7 @@ static void br_stp_start(struct net_bridge *br)
 	} else {
 		br->stp_enabled = BR_KERNEL_STP;
 		printk(KERN_INFO "%s: starting userspace STP failed, "
-				"staring kernel STP\n", br->dev->name);
+				"starting kernel STP\n", br->dev->name);
 
 		/* To start timers on any ports left in blocking */
 		spin_lock_bh(&br->lock);