]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2015 03:38:02 +0000 (23:38 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2015 03:38:02 +0000 (23:38 -0400)
commita66ef14b222ffd0f15f5caf6619d37e72bff3ee0
tree02e95f15bd8a04071a9a36f534a92a066a8ce66a
parent872ff23c8070641249fc770b539d1fdc9c06ec1e
parent14f3ae614e483679b4e292f1c87354df39270508
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/cadence/macb.c

Overlapping changes in macb driver, mostly fixes and cleanups
in 'net' overlapping with the integration of at91_ether into
macb in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/cadence/macb.c
drivers/net/ethernet/cadence/macb.h
drivers/net/team/team.c
drivers/net/xen-netback/interface.c
include/net/netfilter/nf_tables.h
net/ipv4/ping.c
net/ipv4/tcp.c
net/ipv6/ping.c
net/netfilter/ipvs/ip_vs_sync.c
net/netfilter/nf_tables_api.c
net/netfilter/nft_compat.c
net/packet/af_packet.c