]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2013 22:56:43 +0000 (15:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2013 23:37:30 +0000 (16:37 -0700)
commit6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2
tree8b049ef383307f5dae91b5c9cf78dbfb9b74a4d1
parent11a164a04382d735230b01f4cc46ad78a7c4abf6
parent4d3797d7e1861ac1af150a6189315786c5e1c820
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Merge 'net' bug fixes into 'net-next' as we have patches
that will build on top of them.

This merge commit includes a change from Emil Goode
(emilgoode@gmail.com) that fixes a warning that would
have been introduced by this merge.  Specifically it
fixes the pingv6_ops method ipv6_chk_addr() to add a
"const" to the "struct net_device *dev" argument and
likewise update the dummy_ipv6_chk_addr() declaration.

Signed-off-by: David S. Miller <davem@davemloft.net>
24 files changed:
arch/arm/configs/omap2plus_defconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/broadcom/tg3.h
drivers/net/ethernet/emulex/benet/be.h
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_hw.h
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/qlogic/qlge/qlge_main.c
drivers/net/ethernet/xilinx/xilinx_emaclite.c
drivers/net/phy/phy.c
drivers/net/team/team.c
include/linux/skbuff.h
include/net/ping.h
net/core/skbuff.c
net/ipv4/ip_tunnel.c
net/ipv4/route.c
net/ipv6/addrconf.c
net/ipv6/ping.c
net/ipv6/udp_offload.c
net/mac80211/iface.c
net/sched/sch_tbf.c
net/xfrm/xfrm_policy.c