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
..
Kconfig	net: Remove bogus dependencies on INET	2012-11-19 19:13:59 -05:00
Makefile	…
bitfield.h	…
efx.c	sfc: make local functions static	2013-03-17 14:26:40 -04:00
efx.h	sfc: allocate more RX buffers per page	2013-03-07 20:22:15 +00:00
enum.h	sfc: Add AER and EEH support for Siena	2013-03-07 20:22:04 +00:00
ethtool.c	sfc: Enable RX DMA scattering where possible	2013-03-07 20:22:12 +00:00
falcon.c	sfc: Enable RX DMA scattering where possible	2013-03-07 20:22:12 +00:00
falcon_boards.c	…
falcon_xmac.c	…
filter.c	sfc: Enable RX DMA scattering where possible	2013-03-07 20:22:12 +00:00
filter.h	…
io.h	sfc: Remove confusing MMIO functions	2012-12-01 00:26:11 +00:00
mcdi.c	sfc: Fix naming of MTD partitions for FPGA bitfiles	2013-04-25 01:37:00 -04:00
mcdi.h	…
mcdi_mac.c	…
mcdi_mon.c	…
mcdi_pcol.h	sfc: PTP changes to support improved UUID filtering mode	2013-03-07 20:21:55 +00:00
mcdi_phy.c	…
mdio_10g.c	…
mdio_10g.h	…
mtd.c	…
net_driver.h	sfc: allocate more RX buffers per page	2013-03-07 20:22:15 +00:00
nic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-20 12:46:26 -04:00
nic.h	sfc: Really disable flow control while flushing	2012-12-01 00:26:09 +00:00
phy.h	…
ptp.c	sfc: Remove rx_alloc_method SKB	2013-03-07 20:21:57 +00:00
qt202x_phy.c	…
regs.h	…
rx.c	sfc: make local functions static	2013-03-17 14:26:40 -04:00
selftest.c	sfc: lock TX queues when calling netif_device_detach()	2012-12-01 02:37:35 +00:00
selftest.h	…
siena.c	sfc: Enable RX DMA scattering where possible	2013-03-07 20:22:12 +00:00
siena_sriov.c	sfc: Remove confusing MMIO functions	2012-12-01 00:26:11 +00:00
spi.h	…
tenxpress.c	…
tx.c	…
txc43128_phy.c	…
vfdi.h	…
workarounds.h	…