David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-01-28 10:33:06 -05:00

..

capi

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

divert

isdn: divert, hysdn: fix interruptible_sleep_on race

2014-02-26 16:06:13 -05:00

gigaset

isdn/gigaset: use designated initializers

2016-12-17 11:56:57 -05:00

hardware

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-28 10:33:06 -05:00

hisax

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-12-17 20:17:04 -08:00

hysdn

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

i4l

isdn: use designated initializers

2016-12-17 11:56:57 -05:00

isdnloop

drivers: isdn: isdnloop: isdnloop.c: Remove parenthesis around return values, as specified in CodingStyle.

2015-02-05 15:40:23 -08:00

mISDN

mISDN: Fixing missing validation in base_sock_bind()

2016-04-13 23:00:50 -04:00

Kconfig

tty: Added a CONFIG_TTY option to allow removal of TTY

2013-01-18 16:15:27 -08:00

Makefile

isdn: i4l: move active-isdn drivers to staging

2016-03-05 15:00:38 -08:00