David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
Kconfig	…
Makefile	…
act_api.c	…
act_bpf.c	…
act_connmark.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
act_csum.c	…
act_gact.c	…
act_ipt.c	netfilter: x_tables: Pass struct net in xt_action_param	2015-09-18 21:58:14 +02:00
act_mirred.c	act_mirred: clear sender cpu before sending to tx	2015-10-08 04:59:04 -07:00
act_nat.c	…
act_pedit.c	…
act_police.c	…
act_simple.c	…
act_skbedit.c	…
act_vlan.c	…
cls_api.c	…
cls_basic.c	…
cls_bpf.c	sched, bpf: add helper for retrieving routing realms	2015-10-03 05:02:41 -07:00
cls_cgroup.c	…
cls_flow.c	…
cls_flower.c	…
cls_fw.c	net: revert "net_sched: move tp->root allocation into fw_init()"	2015-09-24 14:33:30 -07:00
cls_route.c	…
cls_rsvp.c	…
cls_rsvp.h	…
cls_rsvp6.c	…
cls_tcindex.c	…
cls_u32.c	…
em_canid.c	…
em_cmp.c	…
em_ipset.c	netfilter: x_tables: Pass struct net in xt_action_param	2015-09-18 21:58:14 +02:00
em_meta.c	…
em_nbyte.c	…
em_text.c	…
em_u32.c	…
ematch.c	…
sch_api.c	…
sch_atm.c	…
sch_blackhole.c	net/sched: make sch_blackhole.c explicitly non-modular	2015-10-09 07:52:28 -07:00
sch_cbq.c	…
sch_choke.c	…
sch_codel.c	…
sch_drr.c	…
sch_dsmark.c	sch_dsmark: improve memory locality	2015-09-17 22:37:19 -07:00
sch_fifo.c	…
sch_fq.c	net: synack packets can be attached to request sockets	2015-10-11 05:05:06 -07:00
sch_fq_codel.c	…
sch_generic.c	…
sch_gred.c	…
sch_hfsc.c	…
sch_hhf.c	sch_hhf: fix return value of hhf_drop()	2015-10-11 04:49:33 -07:00
sch_htb.c	…
sch_ingress.c	…
sch_mq.c	…
sch_mqprio.c	…
sch_multiq.c	…
sch_netem.c	…
sch_pie.c	…
sch_plug.c	…
sch_prio.c	…
sch_qfq.c	…
sch_red.c	…
sch_sfb.c	…
sch_sfq.c	…
sch_tbf.c	…
sch_teql.c	…