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

Conflicts:
	drivers/net/gianfar.c

diff --cc drivers/net/gianfar.c
index 802a9516ce416fa230938ff9afb2bed40fda78f9,9b12a13a640f1383fdd3265ae3ebe69949f1b936..a64a4385f5a5f992eae32be996f35f03143d18dc
--- 1/drivers/net/gianfar.c
--- 2/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@@ -1665,9 -1626,15 +1665,15 @@@ static void gfar_schedule_cleanup(struc
        spin_lock_irqsave(&priv->txlock, flags);
        spin_lock(&priv->rxlock);
  
 -      if (netif_rx_schedule_prep(&priv->napi)) {
 +      if (napi_schedule_prep(&priv->napi)) {
                gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED);
 -              __netif_rx_schedule(&priv->napi);
 +              __napi_schedule(&priv->napi);
+       } else {
+               /*
+                * Clear IEVENT, so interrupts aren't called again
+                * because of the packets that have already arrived.
+                */
+               gfar_write(&priv->regs->ievent, IEVENT_RTX_MASK);
        }
  
        spin_unlock(&priv->rxlock);

diff --cc drivers/net/netxen/netxen_nic_main.c
Simple merge

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