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

Conflicts:
	drivers/net/wireless/orinoco/orinoco.c

2009-02-25 00:02:05 -08:00

..

netfilter

…

addrconf_core.c

…

addrconf.c

netlink: change nlmsg_notify() return value logic

2009-02-24 23:18:28 -08:00

addrlabel.c

…

af_inet6.c

…

ah6.c

…

anycast.c

…

datagram.c

…

esp6.c

…

exthdrs_core.c

…

exthdrs.c

…

fib6_rules.c

…

icmp.c

…

inet6_connection_sock.c

…

inet6_hashtables.c

…

ip6_fib.c

…

ip6_flowlabel.c

…

ip6_input.c

…

ip6_output.c

…

ip6_tunnel.c

…

ip6mr.c

…

ipcomp6.c

…

ipv6_sockglue.c

ipv6: Remove some pointless conditionals before kfree_skb()

2009-02-24 23:33:52 -08:00

Kconfig

…

Makefile

…

mcast.c

…

mip6.c

…

ndisc.c

netlink: change nlmsg_notify() return value logic

2009-02-24 23:18:28 -08:00

netfilter.c

…

proc.c

…

protocol.c

…

raw.c

…

reassembly.c

…

route.c

netlink: change nlmsg_notify() return value logic

2009-02-24 23:18:28 -08:00

sit.c

sit: used time_before for comparing jiffies

2009-02-24 23:37:19 -08:00

syncookies.c

…

sysctl_net_ipv6.c

…

tcp_ipv6.c

ipv6: Remove some pointless conditionals before kfree_skb()

2009-02-24 23:33:52 -08:00

tunnel6.c

…

udp_impl.h

…

udp.c

…

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

…

xfrm6_state.c

…

xfrm6_tunnel.c

…