David S. Miller 9f6d98c298 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c The bnx2x gso_type setting bug fix in 'net' conflicted with changes in 'net-next' that broke the gso_* setting logic out into a seperate function, which also fixes the bug in question. Thus, use the 'net-next' version. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-02-12 18:58:28 -05:00
..
8139cp.c	remove init of dev->perm_addr in drivers	2013-01-08 18:00:48 -08:00
8139too.c	remove init of dev->perm_addr in drivers	2013-01-08 18:00:48 -08:00
atp.c	atp: remove set_rx_mode_8012()	2012-11-03 15:43:04 -04:00
atp.h	atp: remove set_rx_mode_8012()	2012-11-03 15:43:04 -04:00
Kconfig	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
Makefile	net/ethernet: sc92031 is not Realtek	2011-11-01 19:30:38 -04:00
r8169.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-12 18:58:28 -05:00