From: David S. Miller <davem@davemloft.net>
Date: Tue, 16 Dec 2008 04:03:50 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.29-rc1~581^2~184
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eb14f019597cd86c21a6c601d7e900f40030c2e7;p=linux-2.6-omap-h63xx.git

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

Conflicts:

	drivers/net/e1000e/ich8lan.c
---

eb14f019597cd86c21a6c601d7e900f40030c2e7
diff --cc drivers/net/e1000e/ich8lan.c
index 92f2ace7ca6,d115a6d30f2..f2a5963b5a9
--- a/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);
+ 	/* 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);
  
diff --cc net/phonet/pep-gprs.c
index e6e8e44852e,803eeef0aa8..22848dd7d67
--- a/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;
  }
  
  /*