David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
common.h	xen-netback: reintroduce guest Rx stall detection	2014-10-25 14:15:20 -04:00
interface.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-01 14:53:27 -04:00
Makefile
netback.c	xen-netback: remove unconditional __pskb_pull_tail() in guest Tx path	2014-11-06 14:40:18 -05:00
xenbus.c	netback: don't store invalid vif pointer	2014-12-09 18:30:08 -05:00