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/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index afeede7ee29..2a7d17c1948 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1530,7 +1530,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data)
                 printk (KERN_WARNING
                                 "UPDOWN: Line protocol on Interface %s,"
                                 " changed state to down\n", lp->netdev->dev->name);
-                /* should stop routing higher-level data accross */
+                /* should stop routing higher-level data across */
         } else if ((!lp->cisco_line_state) &&
                 (myseq_diff >= 0) && (myseq_diff <= 2)) {
                 /* line down -> up */
@@ -1538,7 +1538,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data)
                 printk (KERN_WARNING
                                 "UPDOWN: Line protocol on Interface %s,"
                                 " changed state to up\n", lp->netdev->dev->name);
-                /* restart routing higher-level data accross */
+                /* restart routing higher-level data across */
         }
 
         if (lp->cisco_debserint)