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

configfs: remove old API

2015-10-13 22:17:57 -07:00

connector

make use of make variable CURDIR instead of calling pwd

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

hidraw

HID: samples/hidraw: make it possible to select device

2015-03-15 10:11:21 -04:00

hw_breakpoint

perf: Add context field to perf_event

2011-07-01 11:06:38 +02:00

kdb

kdb: Add kdb kernel module sample

2010-10-29 13:14:39 -05:00

kfifo

kfifo API type safety

2013-11-15 09:32:23 +09:00

kobject

samples/kobject: be explicit in the module license

2015-03-25 13:41:42 +01:00

kprobes

samples/kretprobe: fix the wrong type

2016-08-04 08:50:07 -04:00

livepatch

livepatch: reuse module loader code to write relocations

2016-04-01 15:00:11 +02:00

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

samples: Add an IPv6 '-6' option to the pktgen scripts

2016-07-20 22:16:02 -07:00

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

tracing: Add trace_printk sample code

2016-06-20 09:54:21 -04:00

uhid

HID: uhid: improve uhid example client

2013-09-04 11:35:14 +02:00

v4l

[media] vb2: replace void *alloc_ctxs by struct device *alloc_devs

2016-07-08 14:45:07 -03:00

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