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
..
clock.c
core.c
core.h
dsp_audio.c
dsp_biquad.h
dsp_blowfish.c
dsp_cmx.c
dsp_core.c
dsp_dtmf.c
dsp_ecdis.h
dsp_hwec.c
dsp_hwec.h
dsp_pipeline.c
dsp_tones.c
dsp.h
fsm.c
fsm.h
hwchannel.c
Kconfig
l1oip_codec.c
l1oip_core.c
l1oip.h
layer1.c
layer1.h
layer2.c
layer2.h
Makefile
socket.c
stack.c
tei.c
timerdev.c