David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

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

2011-12-23 17:13:56 -05:00

..

act_api.c

net: Fix files explicitly needing to include module.h

2011-10-31 19:30:28 -04:00

act_csum.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

act_gact.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

act_ipt.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

act_mirred.c

net_sched: fix port mirror/redirect stats reporting

2011-08-17 20:10:20 -07:00

act_nat.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

act_pedit.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

act_police.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

act_simple.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

act_skbedit.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

cls_api.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

cls_basic.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

cls_cgroup.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

cls_flow.c

cls_flow: remove one dynamic array

2011-12-14 13:34:55 -05:00

cls_fw.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

cls_route.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

cls_rsvp6.c

…

cls_rsvp.c

…

cls_rsvp.h

pkt_sched: cls_rsvp.h was outdated

2011-09-15 14:49:43 -04:00

cls_tcindex.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

cls_u32.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

em_cmp.c

…

em_meta.c

net: remove SK_ROUTE_CAPS from meta ematch

2011-07-14 14:45:59 -07:00

em_nbyte.c

…

em_text.c

…

em_u32.c

…

ematch.c

…

Kconfig

…

Makefile

…

sch_api.c

net: sched: constify tcf_proto and tc_action

2011-07-06 02:52:16 -07:00

sch_atm.c

…

sch_blackhole.c

…

sch_cbq.c

…

sch_choke.c

sch_red: generalize accurate MAX_P support to RED/GRED/CHOKE

2011-12-09 13:46:15 -05:00

sch_drr.c

…

sch_dsmark.c

…

sch_fifo.c

…

sch_generic.c

net: Add queue state xoff flag for stack

2011-11-29 12:46:19 -05:00

sch_gred.c

sch_gred: prefer GFP_KERNEL allocations

2011-12-16 15:40:33 -05:00

sch_hfsc.c

sch_hfsc: report backlog information

2011-12-23 16:51:18 -05:00

sch_htb.c

…

sch_ingress.c

…

sch_mq.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

sch_mqprio.c

mqprio: Avoid panic if no options are provided

2011-12-22 22:34:56 -05:00

sch_multiq.c

net: Add queue state xoff flag for stack

2011-11-29 12:46:19 -05:00

sch_netem.c

netem: loss model API sizes

2011-12-23 16:51:18 -05:00

sch_prio.c

net_sched: prio: use qdisc_dequeue_peeked

2011-08-09 21:52:11 -07:00

sch_qfq.c

…

sch_red.c

sch_red: generalize accurate MAX_P support to RED/GRED/CHOKE

2011-12-09 13:46:15 -05:00

sch_sfb.c

sch_sfb: use skb_flow_dissect()

2011-11-28 19:09:28 -05:00

sch_sfq.c

sch_sfq: rehash queues in perturb timer

2011-12-21 15:44:34 -05:00

sch_tbf.c

…

sch_teql.c

net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.

2011-12-05 15:20:19 -05:00