David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/tx.c Minor iwlwifi conflict in TX queue disabling between 'net', which removed a bogus warning, and 'net-next' which added some status register poking code. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-25 12:49:17 -05:00
..
8139cp.c	8139cp: revert "set ring address before enabling receiver"	2012-11-23 13:59:43 -05:00
8139too.c	sections: fix section conflicts in drivers/net	2012-10-06 03:04:42 +09: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	r8169: Drop tp arg from rtl8169_tx_vlan_tag()	2012-11-11 23:32:58 +01:00