David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
act_api.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_csum.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_gact.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_ipt.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_mirred.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_nat.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_pedit.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_police.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_simple.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
act_skbedit.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
cls_api.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
cls_basic.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
cls_cgroup.c	cgroup: remove cgroup_subsys argument from callbacks	2012-02-02 09:20:22 -08:00
cls_flow.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
cls_fw.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
cls_route.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04: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: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
cls_tcindex.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
cls_u32.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
em_cmp.c	net_sched: cleanups	2011-01-19 23:31:12 -08:00
em_meta.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04: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	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04: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	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_atm.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_blackhole.c	pkt_sched: Add qdisc->ops->peek() implementation.	2008-10-31 00:45:55 -07:00
sch_cbq.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_choke.c	net: sched: factorize code (qdisc_drop())	2012-05-04 11:50:05 -04:00
sch_drr.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_dsmark.c	net: sched: factorize code (qdisc_drop())	2012-05-04 11:50:05 -04:00
sch_fifo.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_generic.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_gred.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-23 23:15:17 -04:00
sch_hfsc.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_htb.c	net: sched: factorize code (qdisc_drop())	2012-05-04 11:50:05 -04: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	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_multiq.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_netem.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
sch_plug.c	net_sched: sch_plug: plug_qdisc_ops is static	2012-02-13 16:04:40 -05:00
sch_prio.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_qfq.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_red.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_sfb.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_sfq.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_tbf.c	pkt_sched: Stop using NLA_PUT*().	2012-04-01 18:11:37 -04:00
sch_teql.c	net: sched: factorize code (qdisc_drop())	2012-05-04 11:50:05 -04:00