git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 4 Jun 2014 06:32:12 +0000 (23:32 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 4 Jun 2014 06:32:12 +0000 (23:32 -0700)
commit	c99f7abf0e69987e4add567e155e042cb1f2a20b
tree	d23898dc30ed25c1dae9bb6325041027d412397a	tree \| snapshot
parent	92ff71b8fe9cd9c673615fc6f3870af7376d7c84	commit \| diff
parent	d8b0426af5b67973585712c9af36b86f6ea97815	commit \| diff

Merge git://git./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	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/port.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/ipheth.c	diff1 \|	diff2 \|	blob \| history
include/linux/netlink.h	diff1 \|	diff2 \|	blob \| history
include/net/inetpeer.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/audit.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_vlan.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/output_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/port.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/renesas/sh_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/team/team.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/ipheth.c	diff1 \|	diff2 \|	blob \| history
include/linux/netlink.h	diff1 \|	diff2 \|	blob \| history
include/net/inetpeer.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/audit.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_vlan.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/output_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_user.c	diff1 \|	diff2 \|	blob \| history