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

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index d8434910fa7..0aac00afb5c 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -433,7 +433,7 @@ static int write_i2c_mem(struct edgeport_serial *serial,
 
         /* We can only send a maximum of 1 aligned byte page at a time */
 
-        /* calulate the number of bytes left in the first page */
+        /* calculate the number of bytes left in the first page */
         write_length = EPROM_PAGE_SIZE -
                                 (start_address & (EPROM_PAGE_SIZE - 1));