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

..

auxdisplay

…

blackfin

…

bpf

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

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

configfs

…

connector

make use of make variable CURDIR instead of calling pwd

2016-12-11 12:12:56 +01:00

hidraw

…

hw_breakpoint

…

kdb

…

kfifo

…

kobject

…

kprobes

…

livepatch

…

mei

…

mic/mpssd

…

pktgen

…

rpmsg

…

seccomp

samples/seccomp: Support programs with >256 instructions

2016-11-01 08:58:17 -07:00

timers

…

trace_events

tracing: Have the reg function allow to fail

2016-12-09 09:13:30 -05:00

trace_printk

…

uhid

…

v4l

…

vfio-mdev

vfio-mdev: remove some dead code

2017-01-11 12:12:37 -07:00

watchdog

…

Kconfig

vfio-mdev: Fix mtty sample driver building

2016-12-30 08:13:30 -07:00

Makefile

vfio-mdev: Fix mtty sample driver building

2016-12-30 08:13:30 -07:00