leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6a06e5e1bb
linux/drivers/net/ethernet/broadcom/bnx2x
History
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-28 14:40:49 -04:00
..
bnx2x_cmn.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
bnx2x_cmn.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-15 11:43:53 -04:00
bnx2x_dcb.c bnx2x: Support DCBX for all functions 2012-06-19 14:34:35 -07:00
bnx2x_dcb.h bnx2x: Update version to 1.72.0 and copyrights 2012-01-26 13:39:52 -05:00
bnx2x_dump.h bnx2x: fix registers dumped 2012-09-13 16:37:52 -04:00
bnx2x_ethtool.c bnx2x: Improve code around bnx2x_tests_str_arr 2012-09-24 15:46:44 -04:00
bnx2x_fw_defs.h drivers/net/ethernet: Fix non-kernel-doc comments with kernel-doc start markers 2012-07-10 23:13:46 -07:00
bnx2x_fw_file_hdr.h bnx2x: Update version to 1.72.0 and copyrights 2012-01-26 13:39:52 -05:00
bnx2x_hsi.h bnx2x: Utilize Link Flap Avoidance 2012-09-13 15:01:39 -04:00
bnx2x_init_ops.h bnx2x: Update version to 1.72.0 and copyrights 2012-01-26 13:39:52 -05:00
bnx2x_init.h bnx2x: add afex support 2012-04-23 22:34:03 -04:00
bnx2x_link.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-15 11:43:53 -04:00
bnx2x_link.h bnx2x: Utilize Link Flap Avoidance 2012-09-13 15:01:39 -04:00
bnx2x_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-28 14:40:49 -04:00
bnx2x_mfw_req.h bnx2x, bnx2fc, bnx2i, cnic: Add statistics support and FCoE capabilities advertisement 2012-06-27 01:20:13 -07:00
bnx2x_reg.h bnx2x: use native EEE instead of auto-greeen 2012-09-10 16:40:29 -04:00
bnx2x_sp.c bnx2x: use list_move_tail instead of list_del/list_add_tail 2012-09-05 17:49:27 -04:00
bnx2x_sp.h drivers/net/ethernet: Fix non-kernel-doc comments with kernel-doc start markers 2012-07-10 23:13:46 -07:00
bnx2x_stats.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-09-15 11:43:53 -04:00
bnx2x_stats.h bnx2x: Added EEE support 2012-06-07 13:18:54 -07:00
bnx2x.h bnx2x: Move netif_napi_add to the open call 2012-08-30 13:36:46 -04:00
Makefile