Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c
index 38fe058fbe6..0ea577bfca2 100644
--- a/drivers/usb/host/fhci-tds.c
+++ b/drivers/usb/host/fhci-tds.c
@@ -40,7 +40,7 @@
 #define TD_RXER         0x0020 /* Rx error or not */
 
 #define TD_NAK          0x0010 /* No ack. */
-#define TD_STAL         0x0008 /* Stall recieved */
+#define TD_STAL         0x0008 /* Stall received */
 #define TD_TO           0x0004 /* time out */
 #define TD_UN           0x0002 /* underrun */
 #define TD_NO           0x0010 /* Rx Non Octet Aligned Packet */
@@ -274,7 +274,7 @@ void fhci_init_ep_registers(struct fhci_usb *usb, struct endpoint *ep,
  * It is also preparing the TDs for new frames. If the Tx interrupts
  * are disabled, the application should call that routine to get
  * confirmation about the submitted frames. Otherwise, the routine is
- * called frome the interrupt service routine during the Tx interrupt.
+ * called from the interrupt service routine during the Tx interrupt.
  * In that case the application is informed by calling the application
  * specific 'fhci_transaction_confirm' routine
  */
@@ -337,7 +337,7 @@ static void fhci_td_transaction_confirm(struct fhci_usb *usb)
                                         pkt->status = USB_TD_RX_ER_NONOCT;
                                 else
                                         fhci_err(usb->fhci, "illegal error "
-                                                 "occured\n");
+                                                 "occurred\n");
                         } else if (td_status & TD_NAK)
                                 pkt->status = USB_TD_TX_ER_NAK;
                         else if (td_status & TD_TO)
@@ -347,7 +347,7 @@ static void fhci_td_transaction_confirm(struct fhci_usb *usb)
                         else if (td_status & TD_STAL)
                                 pkt->status = USB_TD_TX_ER_STALL;
                         else
-                                fhci_err(usb->fhci, "illegal error occured\n");
+                                fhci_err(usb->fhci, "illegal error occurred\n");
                 } else if ((extra_data & TD_TOK_IN) &&
                                 pkt->len > td_length - CRC_SIZE) {
                         pkt->status = USB_TD_RX_DATA_UNDERUN;