Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits) bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL. vlan: Calling vlan_hwaccel_do_receive() is always valid. tproxy: use the interface primary IP address as a default value for --on-ip tproxy: added IPv6 support to the socket match cxgb3: function namespace cleanup tproxy: added IPv6 support to the TPROXY target tproxy: added IPv6 socket lookup function to nf_tproxy_core be2net: Changes to use only priority codes allowed by f/w tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled tproxy: added tproxy sockopt interface in the IPV6 layer tproxy: added udp6_lib_lookup function tproxy: added const specifiers to udp lookup functions tproxy: split off ipv6 defragmentation to a separate module l2tp: small cleanup nf_nat: restrict ICMP translation for embedded header can: mcp251x: fix generation of error frames can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set can-raw: add msg_flags to distinguish local traffic 9p: client code cleanup rds: make local functions/variables static ... Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and drivers/net/wireless/ath/ath9k/debug.c as per David		2010-10-23 11:47:02 -07:00
..
act_api.c
act_csum.c
act_gact.c
act_ipt.c	netfilter: xtables: resolve indirect macros 3/3	2010-10-13 18:00:46 +02:00
act_mirred.c
act_nat.c
act_pedit.c
act_police.c
act_simple.c
act_skbedit.c
cls_api.c
cls_basic.c
cls_cgroup.c	sched: Fix softirq time accounting	2010-10-18 20:52:20 +02:00
cls_flow.c
cls_fw.c
cls_route.c
cls_rsvp6.c
cls_rsvp.c
cls_rsvp.h
cls_tcindex.c
cls_u32.c
em_cmp.c
em_meta.c
em_nbyte.c
em_text.c
em_u32.c
ematch.c
Kconfig
Makefile
sch_api.c
sch_atm.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_blackhole.c
sch_cbq.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_drr.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_dsmark.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_fifo.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_generic.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_gred.c
sch_hfsc.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_htb.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_ingress.c
sch_mq.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_multiq.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_netem.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_prio.c	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
sch_red.c
sch_sfq.c
sch_tbf.c
sch_teql.c