Merge kroah.com:/home/greg/linux/BK/bleed-2.5

into kroah.com:/home/greg/linux/BK/pci-2.5

7 files changed, 8 insertions, 8 deletions

diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h
index 49e455fb58e7..ed539e79588d 100644
--- a/include/net/dn_dev.h
+++ b/include/net/dn_dev.h
@@ -45,7 +45,7 @@ struct dn_ifaddr {
  * device will come up. In the dn_dev structure, it is the actual
  * state.
  *
- * Things have changed here. I've killed timer1 since its a user space
+ * Things have changed here. I've killed timer1 since it's a user space
  * issue for a user space routing deamon to sort out. The kernel does
  * not need to be bothered with it.
  *
diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h
index f39ca239e722..5b8268d9651b 100644
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -195,7 +195,7 @@ typedef struct {
 
 /* The SIR unwrapper async_unwrap_char() will use a Rx-copy-break mechanism
  * when using the optional ZeroCopy Rx, where only small frames are memcpy
- * to a smaller skb to save memory. This is the thresold under which copy
+ * to a smaller skb to save memory. This is the threshold under which copy
  * will happen (and over which it won't happen).
  * Some FIR drivers may use this #define as well...
  * This is the same value as various Ethernet drivers. - Jean II */
diff --git a/include/net/irda/vlsi_ir.h b/include/net/irda/vlsi_ir.h
index f2c66f9296ed..1d209ac6e02a 100644
--- a/include/net/irda/vlsi_ir.h
+++ b/include/net/irda/vlsi_ir.h
@@ -382,7 +382,7 @@ enum vlsi_pio_irenable {
  *		PLSWID = (pulsetime * freq / (BAUD+1)) - 1
  *			where pulsetime is the requested IrPHY pulse width
  *			and freq is 8(16)MHz for 40(48)MHz primary input clock
- *		PREAMB: dont care for SIR
+ *		PREAMB: don't care for SIR
  *
  *		The nominal SIR pulse width is 3/16 bit time so we have PLSWID=12
  *		fixed for all SIR speeds at 40MHz input clock (PLSWID=24 at 48MHz).
@@ -401,7 +401,7 @@ enum vlsi_pio_irenable {
  *		PREAMB = 1
  *
  * FIR-mode:	BAUD = 0
- *		PLSWID: dont care
+ *		PLSWID: don't care
  *		PREAMB = 15
  */
 
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index 1215aa4af55b..4eee5a553ede 100644
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -92,7 +92,7 @@
  * The implementation goals were as follow :
  *	o Obvious : you should not need a PhD to understand what's happening,
  *		the benefit is easier maintainance.
- *	o Flexible : it should accomodate a wide variety of driver
+ *	o Flexible : it should accommodate a wide variety of driver
  *		implementations and be as flexible as the old API.
  *	o Lean : it should be efficient memory wise to minimise the impact
  *		on kernel footprint.
diff --git a/include/net/llc_conn.h b/include/net/llc_conn.h
index 3dd6d0b19f6b..acf62b4e3321 100644
--- a/include/net/llc_conn.h
+++ b/include/net/llc_conn.h
@@ -61,7 +61,7 @@ struct llc_opt {
 	u8		    inc_cntr;
 	u8		    dec_cntr;
 	u8		    connect_step;
-	u8		    last_nr;	   /* NR of last pdu recieved */
+	u8		    last_nr;	   /* NR of last pdu received */
 	u32		    rx_pdu_hdr;	   /* used for saving header of last pdu
 					      received and caused sending FRMR.
 					      Used for resending FRMR */
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 1ebfd5467d8f..2553b06900b8 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1233,7 +1233,7 @@ struct SCTP_association {
 		/* Pointer to last transport I have sent on.  */
 		struct sctp_transport *last_sent_to;
 
-		/* This is the last transport I have recieved DATA on.  */
+		/* This is the last transport I have received DATA on.  */
 		struct sctp_transport *last_data_from;
 
 		/*
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index e95ef92ff9b9..ddf50976c37b 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -177,7 +177,7 @@ struct sctp_sndrcvinfo {
  */
 
 enum sctp_sinfo_flags {
-	MSG_UNORDERED = 1,  /* Send/recieve message unordered. */
+	MSG_UNORDERED = 1,  /* Send/receive message unordered. */
 	MSG_ADDR_OVER = 2,  /* Override the primary destination. */
 	MSG_ABORT=4,        /* Send an ABORT message to the peer. */
 	/* MSG_EOF is already defined per socket.h */