Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Tue, 16 Dec 2008 04:03:50 +0000 (20:03 -0800)]
Conflicts:

drivers/net/e1000e/ich8lan.c

12 files changed:
1  2 
MAINTAINERS
drivers/net/e1000e/ich8lan.c
drivers/net/sungem.c
fs/lockd/host.c
fs/nfsd/nfs4state.c
include/linux/netdevice.h
net/core/netpoll.c
net/ipv4/netfilter/nf_nat_rule.c
net/ipv6/ndisc.c
net/phonet/pep-gprs.c
net/sched/sch_netem.c
net/sunrpc/svcsock.c

diff --cc MAINTAINERS
Simple merge
@@@ -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);
+       /* Whether or not the swflag was acquired, we need to reset the part */
 -      hw_dbg(hw, "Issuing a global reset to ich8lan");
 +      hw_dbg(hw, "Issuing a global reset to ich8lan\n");
        ew32(CTRL, (ctrl | E1000_CTRL_RST));
        msleep(20);
  
Simple merge
diff --cc fs/lockd/host.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
  }
  
  /*
Simple merge
Simple merge