From dd48bfa06b16ad2d153431dbf54bd5cc54294220 Mon Sep 17 00:00:00 2001
From: Cruz Julian Bishop <cruzjbishop@gmail.com>
Date: Mon, 14 Jan 2013 12:29:07 +1000
Subject: [PATCH] --- yaml --- r: 354007 b: refs/heads/master c:
 7864a0ac4b354355ac335ee705cea9be00234901 h: refs/heads/master i:   354005:
 5f1cdee209fb38b6bba191fab9e19782fb5f545d   354003:
 ae7d2017c68f5c2c4c5349cde730936823387c3b   353999:
 3e80cc476bcc5debcfe8bd59ca166e8768a50a51 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/slicoss/slicoss.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a2c1adbce03e..a081e9dac412 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8841d798f42430133a7874430ac634347b31fce5
+refs/heads/master: 7864a0ac4b354355ac335ee705cea9be00234901
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
index 78578ee59557..5aa03eed0722 100644
--- a/trunk/drivers/staging/slicoss/slicoss.c
+++ b/trunk/drivers/staging/slicoss/slicoss.c
@@ -209,7 +209,7 @@ static u32 slic_crc_init;	/* Is table initialized */
  */
 static void slic_mcast_init_crc32(void)
 {
-	u32 c;		/*  CRC shit reg                 */
+	u32 c;			/*  CRC reg                      */
 	u32 e = 0;		/*  Poly X-or pattern            */
 	int i;			/*  counter                      */
 	int k;			/*  byte being shifted into crc  */
@@ -3437,7 +3437,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
 					       (eecodesize - 2));
 			/*
 			    if the ucdoe chksum flag bit worked,
-			    we wouldn't need this shit
+			    we wouldn't need this
 			*/
 			if (ee_chksum == calc_chksum)
 				card->config.EepromValid = true;