From 711132e2c9f26da1af7d7a54f7d83cfbe97cff6d Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike-kernel@sf-tec.de>
Date: Tue, 10 Jul 2007 11:58:02 +0200
Subject: [PATCH] --- yaml --- r: 58735 b: refs/heads/master c:
 8453d43f0ee08ac6c20f390797772a08f81f999a h: refs/heads/master i:   58733:
 7674d3b09ba6a86609e8de9597f88368c8f7ff6e   58731:
 80337d13d144605401ed35600dc79f2f5e981f58   58727:
 84d44b0380d74637625766333a41749f11b65b32   58719:
 c635f6bf0b085743e8069720e2844cd912829ca7 v: v3

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

diff --git a/[refs] b/[refs]
index 49ca27e3b3ec..70d0a3b1507c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 654e02200578799264941e5a9b533563a87f8579
+refs/heads/master: 8453d43f0ee08ac6c20f390797772a08f81f999a
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 2d826fff7e2e..fa29a403a247 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -8036,7 +8036,7 @@ static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
 /**
  * s2io_io_error_detected - called when PCI error is detected
  * @pdev: Pointer to PCI device
- * @state: The current pci conneection state
+ * @state: The current pci connection state
  *
  * This function is called after a PCI bus error affecting
  * this device has been detected.