David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
common.h	xen-netback: Don't destroy the netdev until the vif is shut down	2013-09-19 14:03:51 -04:00
interface.c	xen-netback: Don't destroy the netdev until the vif is shut down	2013-09-19 14:03:51 -04:00
Makefile
netback.c	xen-netback: improve ring effeciency for guest RX	2013-09-30 19:14:11 -04:00
xenbus.c	xen-netback: Handle backend state transitions in a more robust way	2013-09-30 15:13:28 -04:00