renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
Code
75c7e29570
linux-next/drivers/isdn/hisax
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
..
amd7930_fn.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
amd7930_fn.h
arcofi.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
arcofi.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
asuscom.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
avm_a1.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
avm_a1p.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
avm_pci.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
avma1_cs.c drivers/isdn: use module_pcmcia_driver() in pcmcia drivers 2013-03-15 12:26:04 -07:00
bkm_a4t.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
bkm_a8.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
bkm_ax.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
callc.c isdn: Fix typo in drivers/isdn 2012-11-09 17:10:16 -05:00
config.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
diva.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
elsa_cs.c drivers/isdn: use module_pcmcia_driver() in pcmcia drivers 2013-03-15 12:26:04 -07:00
elsa_ser.c isdn: hisax/elsa: fix sleep_on race in elsa FSM 2014-02-26 16:06:13 -05:00
elsa.c isdn: hisax/elsa: fix sleep_on race in elsa FSM 2014-02-26 16:06:13 -05:00
enternow_pci.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
fsm.c driver: isdn: hisax: remove cast for kmalloc/kzalloc return value 2013-03-12 11:40:54 -04:00
fsm.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
gazel.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
hfc4s8s_l1.c isdn: hisax: fix frame calculation 2015-09-22 16:14:31 -07:00
hfc4s8s_l1.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hfc_2bds0.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hfc_2bds0.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hfc_2bs0.c isdn: fix misspelling of current function in string 2014-12-09 16:18:46 -05:00
hfc_2bs0.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hfc_pci.c isdn: Drop big endian cpp checks from telespci and hfc_pci drivers 2014-01-06 15:50:51 -05:00
hfc_pci.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hfc_sx.c isdn: fix misspelling of current function in string 2014-12-09 16:18:46 -05:00
hfc_sx.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hfc_usb.c isdn: fix misspelling of current function in string 2014-12-09 16:18:46 -05:00
hfc_usb.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hfcscard.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
hisax_cfg.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hisax_debug.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hisax_fcpcipnp.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
hisax_fcpcipnp.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hisax_if.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hisax_isac.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hisax_isac.h
hisax.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hscx_irq.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
hscx.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
hscx.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
icc.c hisax/icc: add missing semicolon after label 2014-04-22 21:22:47 -04:00
icc.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
ipac.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
ipacx.c isdn: fix misspelling of current function in string 2014-12-09 16:18:46 -05:00
ipacx.h
isac.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
isac.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
isar.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
isar.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
isdnl1.c isdn: fix misspelling of current function in string 2014-12-09 16:18:46 -05:00
isdnl1.h treewide: use __printf not __attribute__((format(printf,...))) 2011-10-31 17:30:54 -07:00
isdnl2.c ISDN: fix OOM condition for sending queued I-Frames 2015-10-22 07:23:19 -07:00
isdnl2.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
isdnl3.c isdn: fix misspelling of current function in string 2014-12-09 16:18:46 -05:00
isdnl3.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
isurf.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
ix1_micro.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
jade_irq.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
jade.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
jade.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
Kconfig isdn: disable HiSax NetJet driver on microblaze arch 2015-06-21 09:53:01 -07:00
l3_1tr6.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
l3_1tr6.h
l3dss1.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
l3dss1.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
l3ni1.c isdn: hisax: l3ni1.c: Fix for possible null pointer dereference 2014-07-08 16:06:21 -07:00
l3ni1.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
lmgr.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
Makefile isdn: change to new flag variable 2011-03-17 14:05:34 +01:00
mic.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
netjet.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
netjet.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
niccy.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
nj_s.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
nj_u.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
q931.c isdn/hisax: hex vs decimal typo in prfeatureind() 2014-02-06 21:18:06 -08:00
s0box.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
saphir.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
sedlbauer_cs.c drivers/isdn: use module_pcmcia_driver() in pcmcia drivers 2013-03-15 12:26:04 -07:00
sedlbauer.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
sportster.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
st5481_b.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
st5481_d.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
st5481_init.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00
st5481_usb.c isdn/hisax: Convert use of __constant_cpu_to_le16 to cpu_to_le16 2015-06-07 19:42:03 -07:00
st5481.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
tei.c isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00
teleint.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
teles0.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
teles3.c Drivers: isdn: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
teles_cs.c drivers/isdn: use module_pcmcia_driver() in pcmcia drivers 2013-03-15 12:26:04 -07:00
telespci.c isdn: Drop big endian cpp checks from telespci and hfc_pci drivers 2014-01-06 15:50:51 -05:00
w6692.c isdn: clean up debug format string usage 2013-09-13 20:02:50 -04:00
w6692.h isdn: whitespace coding style cleanup 2012-02-21 09:04:01 -08:00