David S. Miller 11fe883936 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>

2010-07-20 18:25:24 -07:00

..

netfilter

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-07-07 15:59:38 -07:00

addrconf_core.c

…

addrconf.c

snmp: 64bit ipstats_mib for all arches

2010-06-30 13:31:19 -07:00

addrlabel.c

net: CONFIG_NET_NS reduction

2010-06-02 05:16:23 -07:00

af_inet6.c

inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()

2010-07-12 20:21:46 -07:00

ah6.c

…

anycast.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

datagram.c

ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option

2010-06-02 07:08:31 -07:00

esp6.c

…

exthdrs_core.c

…

exthdrs.c

ipv6: avoid two atomics in ipv6_rthdr_rcv()

2010-06-14 23:13:06 -07:00

fib6_rules.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

icmp.c

ipv6: fix ICMP6_MIB_OUTERRORS

2010-06-09 18:39:27 -07:00

inet6_connection_sock.c

ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option

2010-06-02 07:08:31 -07:00

inet6_hashtables.c

…

ip6_fib.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip6_flowlabel.c

…

ip6_input.c

…

ip6_output.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip6_tunnel.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip6mr.c

ipmr: dont corrupt lists

2010-06-07 02:57:14 -07:00

ipcomp6.c

…

ipv6_sockglue.c

ipv6: remove ipv6_statistics

2010-06-25 21:33:17 -07:00

Kconfig

…

Makefile

…

mcast.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

mip6.c

IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())

2010-07-18 15:04:33 -07:00

ndisc.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-07-07 15:59:38 -07:00

netfilter.c

netfilter: kill redundant check code in which setting ip_summed value

2010-06-14 16:20:02 +02:00

proc.c

snmp: 64bit ipstats_mib for all arches

2010-06-30 13:31:19 -07:00

protocol.c

…

raw.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

reassembly.c

fragment: add fast path for in-order fragments

2010-06-30 13:44:29 -07:00

route.c

ipv6: RCU changes in ipv6_get_mtu() and ip6_dst_hoplimit()

2010-06-14 23:13:07 -07:00

sit.c

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

syncookies.c

syncookies: add support for ECN

2010-06-26 22:00:03 -07:00

sysctl_net_ipv6.c

…

tcp_ipv6.c

inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()

2010-07-12 20:21:46 -07:00

tunnel6.c

…

udp_impl.h

…

udp.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-06-06 17:42:02 -07:00

udplite.c

…

xfrm6_input.c

…

xfrm6_mode_beet.c

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

…

xfrm6_output.c

…

xfrm6_policy.c

xfrm: fix xfrm by MARK logic

2010-07-04 11:46:07 -07:00

xfrm6_state.c

…

xfrm6_tunnel.c

…