leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
de36cef3e7
linux/drivers/net/ethernet/sfc
History
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
..
bitfield.h sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
ef10_regs.h sfc: Use TX PIO for sufficiently small packets 2013-09-20 19:31:52 +01:00
ef10.c sfc: Allocate and link PIO buffers; map them with write-combining 2013-09-20 19:31:49 +01:00
efx.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
efx.h sfc: Remove extern from function prototypes 2013-09-24 12:52:53 -07:00
enum.h sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
ethtool.c sfc: Use TX PIO for sufficiently small packets 2013-09-20 19:31:52 +01:00
falcon_boards.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
falcon.c sfc: check for allocation failure 2013-09-04 13:07:47 -04:00
farch_regs.h sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
farch.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
filter.h sfc: Update copyright banners 2013-08-29 23:34:51 +01: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: Update copyright banners 2013-08-29 23:34:51 +01:00
mcdi_pcol.h sfc: Allocate NVRAM partition ID range for PHY images 2013-08-29 18:12:17 +01:00
mcdi_port.c sfc: Minimal support for 40G link speed 2013-09-05 22:32:57 +01:00
mcdi.c sfc: Increase MCDI status timeout to 250ms 2013-09-20 17:24:35 +01:00
mcdi.h sfc: Remove extern from function prototypes 2013-09-24 12:52:53 -07: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: Use TX PIO for sufficiently small packets 2013-09-20 19:31:52 +01:00
nic.c sfc: Add EF10 registers to register dump 2013-09-20 19:31:45 +01:00
nic.h sfc: Remove extern from function prototypes 2013-09-24 12:52:53 -07:00
phy.h sfc: Remove extern from function prototypes 2013-09-24 12:52:53 -07:00
ptp.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
qt202x_phy.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
rx.c sfc: Support ARFS for IPv6 flows 2013-09-20 19:32:00 +01:00
selftest.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
selftest.h sfc: Remove extern from function prototypes 2013-09-24 12:52:53 -07:00
siena_sriov.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
siena.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
tenxpress.c sfc: Update copyright banners 2013-08-29 23:34:51 +01:00
tx.c sfc: Use TX PIO for sufficiently small packets 2013-09-20 19:31:52 +01: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