p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/isdn/mISDN
History
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 treewide: Fix typo in Kconfig 2013-12-02 14:54:57 +01:00
Makefile
…
clock.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
core.c ISDN: convert class code to use dev_groups 2013-07-26 18:05:17 -07:00
core.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp.h mISDN: DSP scheduling fix (version 2) 2012-04-26 03:10:45 -04:00
dsp_audio.c isdn: Remove reverse_bits(), use revbit8() 2015-08-10 14:29:04 -07:00
dsp_biquad.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_blowfish.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
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 mISDN: Fix division by zero 2012-04-26 03:10:45 -04:00
dsp_ecdis.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_hwec.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_hwec.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
dsp_pipeline.c mISDN: use kstrdup() in dsp_pipeline_build 2015-10-13 18:29:50 -07:00
dsp_tones.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
fsm.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
fsm.h
…
hwchannel.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
l1oip.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
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 mISDN: Layer1 statemachine fix 2012-05-04 11:55:39 -04:00
layer1.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
layer2.c mISDN: fix OOM condition for sending queued I-Frames 2015-10-22 07:23:19 -07:00
layer2.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
socket.c net: Pass kern from net_proto_family.create to sk_alloc 2015-05-11 10:50:17 -04:00
stack.c hlist: drop the node parameter from iterators 2013-02-27 19:10:24 -08:00
tei.c mISDN: improve bitops usage 2012-11-30 12:10:57 -05:00
timerdev.c mISDN: grabbing/dropping reference to THIS_MODULE in open/release is racy 2013-04-29 15:41:49 -04:00