David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-06-03 23:32:12 -07:00

..

bnx2x_cmn.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-06-03 23:32:12 -07:00

bnx2x_cmn.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_dcb.c

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_dcb.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_dump.h

bnx2x: Revise comments and alignment

2013-06-02 21:36:47 -07:00

bnx2x_ethtool.c

Merge branch 'ethtool-rssh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/net-next

2014-06-02 23:07:02 -07:00

bnx2x_fw_defs.h

bnx2x: Remove unnecessary internal mem config

2014-02-12 19:15:41 -05:00

bnx2x_fw_file_hdr.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_hsi.h

bnx2x: Support mng. request for driver version

2014-03-25 21:07:03 -04:00

bnx2x_init_ops.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_init.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_link.c

bnx2x: Remove useless return variables

2014-06-02 16:58:13 -07:00

bnx2x_link.h

bnx2x: namespace and dead code cleanups

2014-01-13 11:59:47 -08:00

bnx2x_main.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-06-03 23:32:12 -07: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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-01-06 17:37:45 -05:00

bnx2x_sp.c

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_sp.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_sriov.c

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_sriov.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_stats.c

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_stats.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_vfpf.c

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x_vfpf.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

bnx2x.h

bnx2x: update MAINTAINERS for bnx2x and e-mail addresses

2014-05-30 17:04:26 -07:00

Makefile

bnx2x: Segregate SR-IOV code

2013-01-07 19:49:14 -08:00