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

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index e4ea61944c22..d9267cb98a23 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -370,7 +370,7 @@ static void speed_bulk_callback(struct urb *urb)
         /* urb is now available */
         //urb->status = 0; -> tested above
 
-        /* New speed and xbof is now commited in hardware */
+        /* New speed and xbof is now committed in hardware */
         self->new_speed = -1;
         self->new_xbofs = -1;
 
@@ -602,7 +602,7 @@ static void write_bulk_callback(struct urb *urb)
                         IRDA_DEBUG(1, "%s(), Changing speed now...\n", __func__);
                         irda_usb_change_speed_xbofs(self);
                 } else {
-                        /* New speed and xbof is now commited in hardware */
+                        /* New speed and xbof is now committed in hardware */
                         self->new_speed = -1;
                         self->new_xbofs = -1;
                         /* Done, waiting for next packet */