]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Jun 2014 06:32:12 +0000 (23:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Jun 2014 06:32:12 +0000 (23:32 -0700)
commitc99f7abf0e69987e4add567e155e042cb1f2a20b
treed23898dc30ed25c1dae9bb6325041027d412397a
parent92ff71b8fe9cd9c673615fc6f3870af7376d7c84
parentd8b0426af5b67973585712c9af36b86f6ea97815
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>
26 files changed:
MAINTAINERS
drivers/net/ethernet/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/mellanox/mlx4/port.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/ti/davinci_emac.c
drivers/net/team/team.c
drivers/net/usb/ipheth.c
include/linux/netlink.h
include/net/inetpeer.h
include/uapi/linux/audit.h
net/bridge/br_fdb.c
net/bridge/br_private.h
net/bridge/br_vlan.c
net/core/dev.c
net/core/filter.c
net/core/rtnetlink.c
net/ipv4/tcp_input.c
net/ipv6/output_core.c
net/netfilter/ipvs/ip_vs_core.c
net/netlink/af_netlink.c
net/xfrm/xfrm_user.c