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

…

amd7930_fn.h

…

arcofi.c

…

arcofi.h

…

asuscom.c

…

avm_a1.c

…

avm_a1p.c

…

avm_pci.c

…

avma1_cs.c

…

bkm_a4t.c

…

bkm_a8.c

…

bkm_ax.h

…

callc.c

…

config.c

…

diva.c

…

elsa_cs.c

…

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

…

fsm.c

…

fsm.h

…

gazel.c

…

hfc4s8s_l1.c

isdn: hisax: fix frame calculation

2015-09-22 16:14:31 -07:00

hfc4s8s_l1.h

…

hfc_2bds0.c

…

hfc_2bds0.h

…

hfc_2bs0.c

isdn: fix misspelling of current function in string

2014-12-09 16:18:46 -05:00

hfc_2bs0.h

…

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

…

hfc_sx.c

isdn: fix misspelling of current function in string

2014-12-09 16:18:46 -05:00

hfc_sx.h

…

hfc_usb.c

isdn: fix misspelling of current function in string

2014-12-09 16:18:46 -05:00

hfc_usb.h

…

hfcscard.c

…

hisax_cfg.h

…

hisax_debug.h

…

hisax_fcpcipnp.c

…

hisax_fcpcipnp.h

…

hisax_if.h

…

hisax_isac.c

…

hisax_isac.h

…

hisax.h

…

hscx_irq.c

…

hscx.c

…

hscx.h

…

icc.c

hisax/icc: add missing semicolon after label

2014-04-22 21:22:47 -04:00

icc.h

…

ipac.h

…

ipacx.c

isdn: fix misspelling of current function in string

2014-12-09 16:18:46 -05:00

ipacx.h

…

isac.c

…

isac.h

…

isar.c

…

isar.h

…

isdnl1.c

isdn: fix misspelling of current function in string

2014-12-09 16:18:46 -05:00

isdnl1.h

…

isdnl2.c

ISDN: fix OOM condition for sending queued I-Frames

2015-10-22 07:23:19 -07:00

isdnl2.h

…

isdnl3.c

isdn: fix misspelling of current function in string

2014-12-09 16:18:46 -05:00

isdnl3.h

…

isurf.c

…

ix1_micro.c

…

jade_irq.c

…

jade.c

…

jade.h

…

Kconfig

isdn: disable HiSax NetJet driver on microblaze arch

2015-06-21 09:53:01 -07:00

l3_1tr6.c

…

l3_1tr6.h

…

l3dss1.c

…

l3dss1.h

…

l3ni1.c

isdn: hisax: l3ni1.c: Fix for possible null pointer dereference

2014-07-08 16:06:21 -07:00

l3ni1.h

…

lmgr.c

…

Makefile

…

mic.c

…

netjet.c

…

netjet.h

…

niccy.c

…

nj_s.c

…

nj_u.c

…

q931.c

isdn/hisax: hex vs decimal typo in prfeatureind()

2014-02-06 21:18:06 -08:00

s0box.c

…

saphir.c

…

sedlbauer_cs.c

…

sedlbauer.c

…

sportster.c

…

st5481_b.c

…

st5481_d.c

…

st5481_init.c

…

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

…

tei.c

…

teleint.c

…

teles0.c

…

teles3.c

…

teles_cs.c

…

telespci.c

isdn: Drop big endian cpp checks from telespci and hfc_pci drivers

2014-01-06 15:50:51 -05:00

w6692.c

…

w6692.h

…