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

Conflicts:

	drivers/net/enc28j60.c

diff --cc drivers/net/enc28j60.c
index d3c8e742e9eaf01f722511a2fb5af2dc24d5a07c,36cb6e95b465c2545b822d30c14a675b6bd39e07..535e14094971b6e0cba6411d9edc906020cec938
--- 1/drivers/net/enc28j60.c
--- 2/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@@ -956,7 -958,8 +956,7 @@@ static void enc28j60_hw_rx(struct net_d
                        /* update statistics */
                        ndev->stats.rx_packets++;
                        ndev->stats.rx_bytes += len;
-                       netif_rx(skb);
 -                      ndev->last_rx = jiffies;
+                       netif_rx_ni(skb);
                }
        }
        /*

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