David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04:00
..
8139cp.c	8139cp: Don't receive packets when the napi budget == 0	2014-03-13 15:18:45 -04:00
8139too.c	8139too: Call dev_kfree_skby_any instead of dev_kfree_skb.	2014-03-12 16:22:12 -04: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
r8169.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00