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	samples: move auxdisplay example code from Documentation	2016-09-23 11:52:32 -06:00
blackfin	samples: move blackfin gptimers-example from Documentation	2016-10-10 07:12:02 -06:00
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	samples/kretprobe: fix the wrong type	2016-08-04 08:50:07 -04:00
livepatch
mei	samples: move misc-devices/mei example code from Documentation	2016-09-23 11:51:43 -06:00
mic/mpssd	samples: move mic/mpssd example code from Documentation	2016-09-20 12:38:48 -06:00
pktgen
rpmsg	rpmsg: Allow callback to return errors	2016-09-08 22:15:25 -07:00
seccomp	samples/seccomp: Support programs with >256 instructions	2016-11-01 08:58:17 -07:00
timers	samples: move timers example code from Documentation	2016-09-23 11:51:58 -06:00
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	samples: move watchdog example code from Documentation	2016-09-23 11:52:14 -06:00
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