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

Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

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

2016-05-04 00:52:29 -04:00

..

bpf

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

2016-05-04 00:52:29 -04:00

configfs

configfs: remove old API

2015-10-13 22:17:57 -07: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

kprobes: use _do_fork() in samples to make them work again

2015-10-01 21:42:35 -04:00

livepatch

livepatch: rename config to CONFIG_LIVEPATCH

2015-02-04 11:25:51 +01:00

pktgen

pktgen: add benchmark script pktgen_bench_xmit_mode_netif_receive.sh

2015-05-22 23:59:17 -04:00

rpmsg

misc: remove __dev* attributes.

2013-01-03 15:57:16 -08:00

seccomp

samples/seccomp: improve label helper

2015-02-17 14:34:55 -08:00

trace_events

Sample: Trace_event: Correct the comments

2015-11-02 14:09:15 -05:00

uhid

HID: uhid: improve uhid example client

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

Kconfig

configfs: remove old API

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

Makefile

configfs: remove old API

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