Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index d2639c4a086d..5d6c1530a8c0 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3966,7 +3966,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter,
         /* VFs are limited to using the MTA hash table for their multicast
          * addresses */
         for (i = 0; i < n; i++)
-                vf_data->vf_mc_hashes[i] = hash_list[i];;
+                vf_data->vf_mc_hashes[i] = hash_list[i];
 
         /* Flush and reset the mta with the new values */
         igb_set_rx_mode(adapter->netdev);