Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity
android_kernel_samsung_msm8976/drivers/net/ethernet/broadcom/bnx2x
History
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
..
Makefile
…
bnx2x.h bnx2x: update version to 1.78.17-0 2013-04-22 15:34:40 -04:00
bnx2x_cmn.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-30 03:55:20 -04:00
bnx2x_cmn.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-30 03:55:20 -04:00
bnx2x_dcb.c bnx2x: fix assignment of signed expression to unsigned variable 2013-03-24 17:27:28 -04:00
bnx2x_dcb.h bnx2x: Introduce 2013 and advance version to 1.78.02 2013-01-15 15:07:59 -05:00
bnx2x_dump.h
…
bnx2x_ethtool.c bnx2x: Allow RX/TX pause control in autoneg 2013-04-24 16:33:53 -04:00
bnx2x_fw_defs.h bnx2x, bnx2fc: Use per port max exchange resources 2013-04-25 04:06:46 -04:00
bnx2x_fw_file_hdr.h bnx2x: Introduce 2013 and advance version to 1.78.02 2013-01-15 15:07:59 -05:00
bnx2x_hsi.h bnx2x: use FW 7.8.17 2013-03-12 07:54:26 -04:00
bnx2x_init.h bnx2x: Introduce 2013 and advance version to 1.78.02 2013-01-15 15:07:59 -05:00
bnx2x_init_ops.h bnx2x: Remove many sparse warnings 2013-01-23 13:58:29 -05:00
bnx2x_link.c bnx2x: Allow RX/TX pause control in autoneg 2013-04-24 16:33:53 -04:00
bnx2x_link.h bnx2x: Support reading I2C EEPROM SFF8472 2013-03-27 12:48:32 -04:00
bnx2x_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-30 03:55:20 -04:00
bnx2x_mfw_req.h bnx2x: Introduce 2013 and advance version to 1.78.02 2013-01-15 15:07:59 -05:00
bnx2x_reg.h bnx2x: Take chip version from MFW 2013-03-12 07:54:22 -04:00
bnx2x_sp.c bnx2x: increase inner ip id during encapsulated tso 2013-03-22 10:23:34 -04:00
bnx2x_sp.h bnx2x: increase inner ip id during encapsulated tso 2013-03-22 10:23:34 -04:00
bnx2x_sriov.c bnx2x: fix compilation without CONFIG_BNX2X_SRIOV 2013-03-27 23:26:14 -04:00
bnx2x_sriov.h bnx2x: Enhance MAC configuration for VFs 2013-04-24 16:33:53 -04:00
bnx2x_stats.c bnx2x: Fix VF statistics 2013-03-27 12:48:32 -04:00
bnx2x_stats.h bnx2x: Fix VF statistics 2013-03-27 12:48:32 -04:00
bnx2x_vfpf.c bnx2x: Enhance MAC configuration for VFs 2013-04-24 16:33:53 -04:00
bnx2x_vfpf.h bnx2x: Add iproute2 support for vfs 2013-03-12 07:54:23 -04:00