David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv6/xfrm6_output.c net/openvswitch/flow_netlink.c net/openvswitch/vport-gre.c net/openvswitch/vport-vxlan.c net/openvswitch/vport.c net/openvswitch/vport.h The openvswitch conflicts were overlapping changes. One was the egress tunnel info fix in 'net' and the other was the vport ->send() op simplification in 'net-next'. The xfrm6_output.c conflicts was also a simplification overlapping a bug fix. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-24 06:54:12 -07:00
..
Kconfig	…
Makefile	…
clock.c	…
core.c	…
core.h	…
dsp.h	…
dsp_audio.c	isdn: Remove reverse_bits(), use revbit8()	2015-08-10 14:29:04 -07:00
dsp_biquad.h	…
dsp_blowfish.c	…
dsp_cmx.c	treewide: Fix typo in printk	2015-08-07 13:58:05 +02:00
dsp_core.c	treewide: Fix typo in printk messages	2015-03-06 23:05:39 +01:00
dsp_dtmf.c	…
dsp_ecdis.h	…
dsp_hwec.c	…
dsp_hwec.h	…
dsp_pipeline.c	mISDN: use kstrdup() in dsp_pipeline_build	2015-10-13 18:29:50 -07:00
dsp_tones.c	…
fsm.c	…
fsm.h	…
hwchannel.c	…
l1oip.h	…
l1oip_codec.c	mISDN: Deletion of unnecessary checks before the function call "vfree"	2014-11-21 12:17:53 -05:00
l1oip_core.c	treewide: fix typo in printk and Kconfig	2014-11-20 14:56:11 +01:00
layer1.c	…
layer1.h	…
layer2.c	mISDN: fix OOM condition for sending queued I-Frames	2015-10-22 07:23:19 -07:00
layer2.h	…
socket.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
stack.c	…
tei.c	…
timerdev.c	…