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

Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

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

2012-02-26 21:55:51 -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

[NET_SCHED]: Remove unnecessary includes

2007-07-10 22:16:41 -07:00

cls_rsvp.c

[NET_SCHED]: Remove unnecessary includes

2007-07-10 22:16:41 -07:00

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

net_sched: cleanups

2011-01-19 23:31:12 -08:00

em_meta.c

net: remove SK_ROUTE_CAPS from meta ematch

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

em_nbyte.c

net_sched: cleanups

2011-01-19 23:31:12 -08:00

em_text.c

net_sched: cleanups

2011-01-19 23:31:12 -08:00

em_u32.c

net_sched: cleanups

2011-01-19 23:31:12 -08:00

ematch.c

net_sched: cleanups

2011-01-19 23:31:12 -08:00

Kconfig

net/sched: sch_plug - Queue traffic until an explicit release command

2012-02-07 12:54:56 -05:00

Makefile

net/sched: sch_plug - Queue traffic until an explicit release command

2012-02-07 12:54:56 -05:00

sch_api.c

net_sched: qdisc_alloc_handle() can be too slow

2012-01-03 13:03:20 -05:00

sch_atm.c

net: remove interrupt.h inclusion from netdevice.h

2011-06-06 22:55:11 -07:00

sch_blackhole.c

pkt_sched: Add qdisc->ops->peek() implementation.

2008-10-31 00:45:55 -07:00

sch_cbq.c

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

2011-01-24 14:09:35 -08:00

sch_choke.c

net: Make qdisc_skb_cb upper size bound explicit.

2012-02-09 13:50:34 -05:00

sch_drr.c

net_sched: accurate bytes/packets stats/rates

2011-01-20 23:31:33 -08:00

sch_dsmark.c

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

2011-01-24 14:09:35 -08:00

sch_fifo.c

net_sched: reduce fifo qdisc size

2011-03-03 11:10:02 -08:00

sch_generic.c

net: Add queue state xoff flag for stack

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

sch_gred.c

net_sched: red: split red_parms into parms and vars

2012-01-05 14:01:21 -05:00

sch_hfsc.c

sch_hfsc: report backlog information

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

sch_htb.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

sch_ingress.c

net_sched: factorize qdisc stats handling

2011-01-10 16:07:54 -08:00

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: fix dequeue

2012-02-19 18:57:50 -05:00

sch_plug.c

net_sched: sch_plug: plug_qdisc_ops is static

2012-02-13 16:04:40 -05:00

sch_prio.c

net_sched: prio: use qdisc_dequeue_peeked

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

sch_qfq.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-01-04 21:35:43 -05:00

sch_red.c

net_sched: red: split red_parms into parms and vars

2012-01-05 14:01:21 -05:00

sch_sfb.c

net: Make qdisc_skb_cb upper size bound explicit.

2012-02-09 13:50:34 -05:00

sch_sfq.c

net: Make qdisc_skb_cb upper size bound explicit.

2012-02-09 13:50:34 -05:00

sch_tbf.c

sch_tbf: report backlog information

2011-12-29 15:07:21 -05:00

sch_teql.c

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

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