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/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index 9e1610f40e16..5bc00156315e 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -1864,7 +1864,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                 psapi >>= 2;
                 ptei >>= 1;
                 if (psapi != l2->sapi) {
-                        /* not our bussiness */
+                        /* not our business */
                         if (*debug & DEBUG_L2)
                                 printk(KERN_DEBUG "%s: sapi %d/%d mismatch\n",
                                         __func__, psapi, l2->sapi);
@@ -1872,7 +1872,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                         return 0;
                 }
                 if ((ptei != l2->tei) && (ptei != GROUP_TEI)) {
-                        /* not our bussiness */
+                        /* not our business */
                         if (*debug & DEBUG_L2)
                                 printk(KERN_DEBUG "%s: tei %d/%d mismatch\n",
                                         __func__, ptei, l2->tei);