David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
bitfield.h	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
ef10_regs.h	sfc: Remove unused definitions of EF10 user-mode DMA descriptors	2014-02-12 17:53:34 -05:00
ef10.c	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
efx.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
efx.h	sfc: Update product naming	2014-02-12 17:53:35 -05:00
enum.h	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
ethtool.c	sfc: Use ether_addr_copy and eth_broadcast_addr	2014-03-10 13:53:37 -04:00
falcon_boards.c	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
falcon.c	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
farch_regs.h	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
farch.c	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
filter.h	sfc: Use ether_addr_copy and eth_broadcast_addr	2014-03-10 13:53:37 -04:00
io.h	sfc: Allocate and link PIO buffers; map them with write-combining	2013-09-20 19:31:49 +01:00
Kconfig	sfc: Minimal support for 40G link speed	2013-09-05 22:32:57 +01:00
Makefile	sfc: Add support for Solarflare SFC9100 family	2013-08-29 19:19:29 +01:00
mcdi_mon.c	sfc: Add new sensor names	2013-12-12 22:06:54 +00:00
mcdi_pcol.h	sfc: Update MCDI protocol definitions	2013-12-06 22:29:20 +00:00
mcdi_port.c	sfc: Use ether_addr_copy and eth_broadcast_addr	2014-03-10 13:53:37 -04:00
mcdi.c	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
mcdi.h	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
mdio_10g.c	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
mdio_10g.h	sfc: Remove extern from function prototypes	2013-09-24 12:52:53 -07:00
mtd.c	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
net_driver.h	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
nic.c	sfc: fix calling of free_irq with already free vector	2014-05-12 14:56:45 -04:00
nic.h	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
phy.h	sfc: Remove extern from function prototypes	2013-09-24 12:52:53 -07:00
ptp.c	ptp: drivers: set the number of programmable pins.	2014-03-21 14:21:14 -04:00
qt202x_phy.c	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
rx.c	net: sfc calls skb_set_hash	2013-12-18 15:00:53 -05:00
selftest.c	sfc: Use ether_addr_copy and eth_broadcast_addr	2014-03-10 13:53:37 -04:00
selftest.h	sfc: Add MC BISTs to ethtool offline self test on EF10	2013-12-12 22:05:48 +00: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
siena.c	sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)	2014-04-16 14:33:57 -04:00
tenxpress.c	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
tx.c	sfc: Rename 'use_options' variable in tso_start() to clearer 'use_opt_desc'	2014-02-12 17:53:35 -05:00
txc43128_phy.c	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
vfdi.h	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00
workarounds.h	sfc: Update copyright banners	2013-08-29 23:34:51 +01:00