2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
linux-next/drivers/net/xen-netback
David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-07-22 00:44:59 -07:00
..
common.h xen-netback: Adding debugfs "io_ring_qX" files 2014-07-08 20:48:36 -07:00
interface.c net: set name_assign_type in alloc_netdev() 2014-07-15 16:12:48 -07:00
Makefile
netback.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-07-22 00:44:59 -07:00
xenbus.c xen-netback: Adding debugfs "io_ring_qX" files 2014-07-08 20:48:36 -07:00