Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 11 Oct 2010 19:30:34 +0000 (12:30 -0700)]
Conflicts:
net/core/ethtool.c

1  2 
drivers/atm/iphase.c
drivers/net/r8169.c
drivers/net/wimax/i2400m/rx.c
net/core/ethtool.c

Simple merge
@@@ -4551,8 -4551,10 +4556,8 @@@ static int rtl8169_rx_interrupt(struct 
                                continue;
                        }
  
 -                      rtl8169_rx_csum(skb, desc);
 -
                        if (rtl8169_try_rx_copy(&skb, tp, pkt_size, addr)) {
-                               pci_dma_sync_single_for_device(pdev, addr,
+                               dma_sync_single_for_device(&pdev->dev, addr,
                                        pkt_size, PCI_DMA_FROMDEVICE);
                                rtl8169_mark_to_asic(desc, tp->rx_buf_sz);
                        } else {
Simple merge
Simple merge