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

Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c

2008-03-27 18:48:56 -07:00

..

core.c

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-26 04:39:53 +09:00

Kconfig

[NETFILTER]: Rename ipt_iprange to xt_iprange

2008-01-28 15:02:27 -08:00

Makefile

[NETFILTER]: kill nf_sysctl.c

2008-01-28 15:02:40 -08:00

nf_conntrack_amanda.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_core.c

[NETFILTER]: nf_conntrack: fix smp_processor_id() in preemptible code warning

2008-02-27 12:07:47 -08:00

nf_conntrack_ecache.c

[NETFILTER]: nf_conntrack_expect: function naming unification

2007-07-10 22:17:53 -07:00

nf_conntrack_expect.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_extend.c

[NETFILTER]: nf_conntrack: replace horrible hack with ksize()

2008-03-10 16:43:41 -07:00

nf_conntrack_ftp.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_h323_asn1.c

[NETFILTER]: nf_conntrack_h323: constify and annotate H.323 helper

2008-01-31 19:28:07 -08:00

nf_conntrack_h323_main.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_h323_types.c

[NETFILTER]: nf_conntrack_h323: constify and annotate H.323 helper

2008-01-31 19:28:07 -08:00

nf_conntrack_helper.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_irc.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_l3proto_generic.c

[NETFILTER]: nf_conntrack: remove print_conntrack function from l3protos

2008-01-28 15:02:41 -08:00

nf_conntrack_netbios_ns.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_netlink.c

[NETFILTER]: nf_conntrack_netlink: transmit mark during all events

2008-01-31 19:28:02 -08:00

nf_conntrack_pptp.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_proto_generic.c

[NETFILTER]: nf_conntrack: naming unification

2008-01-31 19:27:59 -08:00

nf_conntrack_proto_gre.c

[NETFILTER]: nf_{conntrack,nat}_proto_gre: annotate with const

2008-01-31 19:28:12 -08:00

nf_conntrack_proto_sctp.c

[NETFILTER]: nf_conntrack: naming unification

2008-01-31 19:27:59 -08:00

nf_conntrack_proto_tcp.c

[NETFILTER] nf_conntrack_proto_tcp.c: Mistyped state corrected.

2008-02-14 14:50:21 -08:00

nf_conntrack_proto_udp.c

[NETFILTER]: nf_{conntrack,nat}_proto_udp{,lite}: annotate with const

2008-01-31 19:28:11 -08:00

nf_conntrack_proto_udplite.c

[NETFILTER]: nf_{conntrack,nat}_proto_udp{,lite}: annotate with const

2008-01-31 19:28:11 -08:00

nf_conntrack_proto.c

[NETFILTER]: Use the ctl paths instead of hand-made analogue

2008-01-28 15:01:11 -08:00

nf_conntrack_sane.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_conntrack_sip.c

[NETFILTER]: nf_conntrack_sip: update copyright

2008-03-25 20:27:05 -07:00

nf_conntrack_standalone.c

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

2008-03-27 18:48:56 -07:00

nf_conntrack_tftp.c

[NETFILTER]: nf_conntrack: introduce expectation classes and policies

2008-03-25 20:09:15 -07:00

nf_internals.h

[NETFILTER]: Replace sk_buff ** with sk_buff *

2007-10-15 12:26:29 -07:00

nf_log.c

[NETFILTER]: Replate direct proc_fops assignment with proc_create call.

2008-03-27 16:55:53 -07:00

nf_queue.c

[NETFILTER]: Replate direct proc_fops assignment with proc_create call.

2008-03-27 16:55:53 -07:00

nf_sockopt.c

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-26 04:39:55 +09:00

nfnetlink_log.c

[NETFILTER]: Replate direct proc_fops assignment with proc_create call.

2008-03-27 16:55:53 -07:00

nfnetlink_queue.c

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

2008-03-27 18:48:56 -07:00

nfnetlink.c

[NETNS]: Consolidate kernel netlink socket destruction.

2008-01-28 15:08:07 -08:00

x_tables.c

[NET] NETNS: Omit seq_net_private->net without CONFIG_NET_NS.

2008-03-26 04:39:56 +09:00

xt_CLASSIFY.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_comment.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_connbytes.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_connlimit.c

[NETFILTER]: nf_conntrack: optimize __nf_conntrack_find()

2008-01-31 19:27:55 -08:00

xt_connmark.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_CONNMARK.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_CONNSECMARK.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_conntrack.c

[NETFILTER]: xt_conntrack: fix IPv4 address comparison

2008-02-27 12:20:41 -08:00

xt_dccp.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_dscp.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_DSCP.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_esp.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_hashlimit.c

[NETFILTER]: Replate direct proc_fops assignment with proc_create call.

2008-03-27 16:55:53 -07:00

xt_helper.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_iprange.c

[NETFILTER]: xt_iprange: fix subtraction-based comparison

2008-02-19 17:20:06 -08:00

xt_length.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_limit.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_mac.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_mark.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_MARK.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_multiport.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_NFLOG.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_NFQUEUE.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_NOTRACK.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_owner.c

[NETFILTER]: xt_owner: allow matching UID/GID ranges

2008-01-31 19:27:43 -08:00

xt_physdev.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_pkttype.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_policy.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_quota.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_rateest.c

[NETFILTER]: x_tables: add rateest match

2008-01-28 14:56:03 -08:00

xt_RATEEST.c

[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

2008-01-28 15:11:10 -08:00

xt_realm.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_sctp.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_SECMARK.c

[NETFILTER]: make secmark_tg_destroy() static

2008-02-13 17:41:39 -08:00

xt_state.c

[NETFILTER]: x_tables: use %u format specifiers

2008-01-28 14:59:07 -08:00

xt_statistic.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_string.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_tcpmss.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_TCPMSS.c

[NETFILTER]: xt_TCPMSS: consider reverse route's MTU in clamp-to-pmtu

2008-01-31 19:27:42 -08:00

xt_TCPOPTSTRIP.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_tcpudp.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_time.c

[NETFILTER]: xt_time: fix failure to match on Sundays

2008-03-10 16:42:40 -07:00

xt_TRACE.c

[NETFILTER]: Update modules' descriptions

2008-01-28 15:02:26 -08:00

xt_u32.c

[NETFILTER]: xt_u32: drop the actually unused variable from u32_match_it

2008-02-19 17:18:20 -08:00