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

diff --cc drivers/net/8139cp.c
Simple merge

diff --cc drivers/net/8139too.c
index cc7d462,97d8068..f5166dc
--- 1/drivers/net/8139too.c
--- 2/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@@ -860,8 -860,9 +860,9 @@@ retry
                }
  
        /* if unknown chip, assume array element #0, original RTL-8139 in this case */
+       i = 0;
        dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n");
 -      dev_dbg(&pdev->dev, "TxConfig = 0x%lx\n", RTL_R32 (TxConfig));
 +      dev_dbg(&pdev->dev, "TxConfig = 0x%x\n", RTL_R32 (TxConfig));
        tp->chipset = 0;
  
  match:

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/r8169.c
Simple merge

diff --cc drivers/net/usb/asix.c
Simple merge

diff --cc drivers/net/wimax/i2400m/fw.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-tx.c
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge