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

Conflicts:
	drivers/net/ethernet/freescale/fsl_pq_mdio.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

2011-12-16 02:11:14 -05:00

..

netfilter

ipv6: Add fragment reporting to ipv6_skip_exthdr().

2011-12-03 09:35:10 -08:00

addrconf_core.c

…

addrconf.c

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

2011-12-16 02:11:14 -05:00

addrlabel.c

…

af_inet6.c

per-netns ipv4 sysctl_tcp_mem

2011-12-12 19:04:11 -05:00

ah6.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

anycast.c

ipv6: Make third arg to anycast_dst_alloc() bool.

2011-12-06 16:48:14 -05:00

datagram.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

esp6.c

…

exthdrs_core.c

ipv6: Add fragment reporting to ipv6_skip_exthdr().

2011-12-03 09:35:10 -08:00

exthdrs.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

fib6_rules.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

icmp.c

ipv6: Add fragment reporting to ipv6_skip_exthdr().

2011-12-03 09:35:10 -08:00

inet6_connection_sock.c

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

2011-11-26 14:47:03 -05:00

inet6_hashtables.c

…

ip6_fib.c

net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.

2011-12-05 15:20:19 -05:00

ip6_flowlabel.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

ip6_input.c

ipv6: Add fragment reporting to ipv6_skip_exthdr().

2011-12-03 09:35:10 -08:00

ip6_output.c

net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.

2011-12-05 15:20:19 -05:00

ip6_tunnel.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

ip6mr.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

ipcomp6.c

…

ipv6_sockglue.c

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

2011-12-02 13:49:21 -05:00

Kconfig

…

Makefile

…

mcast.c

ipv6: Move xfrm_lookup() call down into icmp6_dst_alloc().

2011-12-06 17:04:13 -05:00

mip6.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

ndisc.c

ipv6: Move xfrm_lookup() call down into icmp6_dst_alloc().

2011-12-06 17:04:13 -05:00

netfilter.c

…

proc.c

ipv6: reduce percpu needs for icmpv6msg mibs

2011-11-14 00:12:26 -05:00

protocol.c

…

raw.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

reassembly.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

route.c

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

2011-12-16 02:11:14 -05:00

sit.c

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

2011-12-16 02:11:14 -05:00

syncookies.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

sysctl_net_ipv6.c

…

tcp_ipv6.c

per-netns ipv4 sysctl_tcp_mem

2011-12-12 19:04:11 -05:00

tunnel6.c

…

udp_impl.h

…

udp.c

udp: Export code sk lookup routines

2011-12-09 14:14:08 -05:00

udplite.c

…

xfrm6_input.c

…

xfrm6_mode_beet.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm6_output.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm6_policy.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm6_state.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm6_tunnel.c

…