linux_dsm_epyc7002/drivers/net/ethernet/realtek
David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-26 16:37:08 -04:00
..
8139cp.c 8139cp: Fix skb leak in rx_status_loop failure path. 2013-08-09 11:17:03 -07:00
8139too.c drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb 2013-03-09 16:09:19 -05:00
atp.c drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb 2013-03-09 16:09:19 -05:00
atp.h atp: remove set_rx_mode_8012() 2012-11-03 15:43:04 -04:00
Kconfig net: Move MII out from under NET_CORE and hide it 2013-06-19 22:22:56 -07: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-08-26 16:37:08 -04:00