David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-30 03:55:20 -04:00
..
8139cp.c	net: vlan: add protocol argument to packet tagging functions	2013-04-19 14:46:06 -04:00
8139too.c	drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb	2013-03-09 16:09:19 -05:00
Kconfig	drivers/net/ethernet/realtek: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:40 -08:00
Makefile	net/ethernet: sc92031 is not Realtek	2011-11-01 19:30:38 -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
r8169.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00