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

Conflicts:
	drivers/net/smsc911x.c

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 2aadf88eaa0a..11b774a5eaff 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1438,7 +1438,7 @@ err:
 
 /*
  * Uses MCC for this command as it may be called in BH context
- * (mc == NULL) => multicast promiscous
+ * (mc == NULL) => multicast promiscuous
  */
 int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
                 struct net_device *netdev, struct be_dma_mem *mem)
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 289c73aa6875..1bb763cda3ad 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -703,7 +703,7 @@ static void be_set_multicast_list(struct net_device *netdev)
                 goto done;
         }
 
-        /* BE was previously in promiscous mode; disable it */
+        /* BE was previously in promiscuous mode; disable it */
         if (adapter->promiscuous) {
                 adapter->promiscuous = false;
                 be_cmd_promiscuous_config(adapter, adapter->port_num, 0);