David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
bitfield.h
ef10.c	sfc: add extra RX drop counters for nodesc_trunc and noskb_drop	2014-07-15 22:53:34 -07:00
ef10_regs.h
efx.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
efx.h	sfc: Add support for busy polling	2014-07-22 19:55:20 -07:00
enum.h
ethtool.c	sfc: Add per-queue statistics in ethtool	2014-07-17 16:48:36 -07:00
falcon.c	sfc: add extra RX drop counters for nodesc_trunc and noskb_drop	2014-07-15 22:53:34 -07:00
falcon_boards.c
farch.c	sfc: fix addr_list_lock spinlock use before init	2014-09-16 16:33:34 -04:00
farch_regs.h
filter.h
io.h	sfc: PIO:Restrict to 64bit arch and use 64-bit writes.	2014-06-11 15:36:21 -07:00
Kconfig
Makefile
mcdi.c
mcdi.h
mcdi_mon.c
mcdi_pcol.h
mcdi_port.c	sfc: Add 40G link capability decoding	2014-07-14 19:11:48 -07:00
mdio_10g.c
mdio_10g.h
mtd.c
net_driver.h	sfc: Add support for busy polling	2014-07-22 19:55:20 -07:00
nic.c	sfc: fix calling of free_irq with already free vector	2014-05-12 14:56:45 -04:00
nic.h	sfc: add extra RX drop counters for nodesc_trunc and noskb_drop	2014-07-15 22:53:34 -07:00
phy.h
ptp.c
qt202x_phy.c
rx.c	sfc: Add support for busy polling	2014-07-22 19:55:20 -07:00
selftest.c	sfc: Add support for busy polling	2014-07-22 19:55:20 -07:00
selftest.h
siena.c	sfc: add extra RX drop counters for nodesc_trunc and noskb_drop	2014-07-15 22:53:34 -07:00
siena_sriov.c	net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool.	2014-05-23 15:04:02 -04:00
tenxpress.c
tx.c	sfc: Convert the normal transmit complete path to dev_consume_skb_any()	2014-09-09 17:33:56 -07:00
txc43128_phy.c
vfdi.h
workarounds.h