Linus Torvalds 5fdf11283e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: netfilter: replace old NF_ARP calls with NFPROTO_ARP netfilter: fix compilation error with NAT=n netfilter: xt_recent: use proc_create_data() netfilter: snmp nat leaks memory in case of failure netfilter: xt_iprange: fix range inversion match netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array netfilter: ctnetlink: remove obsolete NAT dependency from Kconfig pkt_sched: sch_generic: Fix oops in sch_teql dccp: Port redirection support for DCCP tcp: Fix IPv6 fallout from 'Port redirection support for TCP' netdev: change name dropping error codes ipvs: Update CONFIG_IP_VS_IPV6 description and help text		2008-10-20 09:06:35 -07:00
..
9p	include: replace __FUNCTION__ with __func__	2008-10-16 11:21:30 -07:00
bluetooth	include: replace __FUNCTION__ with __func__	2008-10-16 11:21:30 -07:00
irda	include: replace __FUNCTION__ with __func__	2008-10-16 11:21:30 -07:00
iucv
netfilter	netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf_nat	2008-10-14 11:58:31 -07:00
netns	netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array	2008-10-20 03:31:54 -07:00
phonet	Phonet: implement GPRS virtual interface over PEP socket	2008-10-05 11:16:16 -07:00
sctp	include: replace __FUNCTION__ with __func__	2008-10-16 11:21:30 -07:00
tc_act	pkt_action: add new action skbedit	2008-09-12 16:30:20 -07:00
tipc
act_api.h
addrconf.h	netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()	2008-08-14 15:33:21 -07:00
af_rxrpc.h
af_unix.h
ah.h
arp.h
atmclip.h
ax25.h
ax88796.h
cfg80211.h	cfg80211: show interface type	2008-09-24 16:18:00 -04:00
checksum.h
cipso_ipv4.h	cipso: Add support for native local labeling and fixup mapping names	2008-10-10 10:16:34 -04:00
compat.h
datalink.h
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dn.h
dsa.h	dsa: add support for Trailer tagging format	2008-10-08 17:24:16 -07:00
dsfield.h
dst.h
esp.h
fib_rules.h
flow.h	ipv4: Loosen source address check on IPv4 output	2008-10-01 07:28:28 -07:00
garp.h
gen_stats.h
genetlink.h
icmp.h
ieee80211_crypt.h
ieee80211_radiotap.h
ieee80211.h	include: replace __FUNCTION__ with __func__	2008-10-16 11:21:30 -07:00
if_inet6.h
inet6_connection_sock.h
inet6_hashtables.h	inet: Don't lookup the socket if there's a socket attached to the skb	2008-10-07 12:41:01 -07:00
inet_common.h
inet_connection_sock.h	net: more #ifdef CONFIG_COMPAT	2008-08-28 02:53:51 -07:00
inet_ecn.h
inet_frag.h
inet_hashtables.h	inet: Don't lookup the socket if there's a socket attached to the skb	2008-10-07 12:41:01 -07:00
inet_sock.h	tcp: Port redirection support for TCP	2008-10-01 07:46:49 -07:00
inet_timewait_sock.h	ipv4: Implement IP_TRANSPARENT socket option	2008-10-01 07:30:02 -07:00
inetpeer.h
ip6_checksum.h
ip6_fib.h
ip6_route.h	netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()	2008-08-14 15:33:21 -07:00
ip6_tunnel.h
ip_fib.h
ip_vs.h	include: replace __FUNCTION__ with __func__	2008-10-16 11:21:30 -07:00
ip.h	sysctl: simplify ->strategy	2008-10-16 11:21:47 -07:00
ipcomp.h
ipconfig.h
ipip.h	inet: Make tunnel RX/TX byte counters more consistent	2008-10-09 12:03:17 -07:00
ipv6.h	ipv6: making ip and icmp statistics per/namespace	2008-10-08 11:16:45 -07:00
ipx.h
iw_handler.h
lapb.h
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
llc.h
mac80211.h	mac80211: fixme for kernel-doc	2008-10-14 21:12:37 -04:00
mip6.h
ndisc.h	sysctl: simplify ->strategy	2008-10-16 11:21:47 -07:00
neighbour.h
net_namespace.h	netfilter: netns nf_conntrack: add netns boilerplate	2008-10-08 11:35:02 +02:00
netdma.h
netevent.h
netlabel.h	netlabel: Add configuration support for local labeling	2008-10-10 10:16:34 -04:00
netlink.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-01 06:12:56 -07:00
netrom.h
nexthop.h
p8022.h
pkt_cls.h
pkt_sched.h	pkt_sched: Remove the tx queue state check in qdisc_run()	2008-09-23 01:05:56 -07:00
protocol.h
psnap.h
raw.h
rawv6.h
red.h
request_sock.h
rose.h
route.h	ipv4: Conditionally enable transparent flow flag when connecting	2008-10-01 07:35:39 -07:00
rtnetlink.h
sch_generic.h	pkt_sched: Fix handling of gso skbs on requeuing	2008-10-06 09:54:39 -07:00
scm.h
slhc_vj.h
snmp.h
sock.h	net: wrap sk->sk_backlog_rcv()	2008-10-07 14:18:42 -07:00
stp.h
syncppp.h
tcp_states.h
tcp.h	net: wrap sk->sk_backlog_rcv()	2008-10-07 14:18:42 -07:00
timewait_sock.h
transp_v6.h
udp.h	netns: make uplitev6 mib per/namespace	2008-10-07 14:50:06 -07:00
udplite.h
wext.h
wireless.h	cfg80211: show interface type	2008-09-24 16:18:00 -04:00
x25.h
x25device.h
xfrm.h	xfrm: MIGRATE enhancements (draft-ebalard-mext-pfkey-enhanced-migrate)	2008-10-05 13:33:42 -07:00