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

Conflicts:

	drivers/net/e1000e/ich8lan.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/e1000e/ich8lan.c
index 92f2ace,d115a6d..f2a5963
--- 1/drivers/net/e1000e/ich8lan.c
--- 2/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@@ -1939,7 -1893,8 +1939,8 @@@ static s32 e1000_reset_hw_ich8lan(struc
                ctrl |= E1000_CTRL_PHY_RST;
        }
        ret_val = e1000_acquire_swflag_ich8lan(hw);
 -      hw_dbg(hw, "Issuing a global reset to ich8lan");
+       /* Whether or not the swflag was acquired, we need to reset the part */
 +      hw_dbg(hw, "Issuing a global reset to ich8lan\n");
        ew32(CTRL, (ctrl | E1000_CTRL_RST));
        msleep(20);
  

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

diff --cc fs/lockd/host.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

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

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

diff --cc net/ipv4/netfilter/nf_nat_rule.c
Simple merge

diff --cc net/ipv6/ndisc.c
Simple merge

diff --cc net/phonet/pep-gprs.c
index e6e8e44,803eeef..22848dd
--- 1/net/phonet/pep-gprs.c
--- 2/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
@@@ -248,8 -272,11 +266,10 @@@ static void gprs_setup(struct net_devic
        net->tx_queue_len       = 10;
  
        net->destructor         = free_netdev;
+       net->open               = gprs_open;
+       net->stop               = gprs_close;
        net->hard_start_xmit    = gprs_xmit; /* mandatory */
        net->change_mtu         = gprs_set_mtu;
 -      net->get_stats          = gprs_get_stats;
  }
  
  /*

diff --cc net/sched/sch_netem.c
Simple merge

diff --cc net/sunrpc/svcsock.c
Simple merge