David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-15 21:16:30 -04: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	Sample program using SO_COOKIE	2017-04-08 08:07:01 -07: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	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: fix 64-bit comparison macros	2017-01-09 17:22:03 +11:00
statx	statx: Include a mask for stx_attributes in struct statx	2017-04-03 01:06:00 -04:00
timers	samples: move timers example code from Documentation	2016-09-23 11:51:58 -06:00
trace_events	sched/core: Remove the tsk_cpus_allowed() wrapper	2017-03-02 08:42:24 +01:00
trace_printk	tracing: Add trace_printk sample code	2016-06-20 09:54:21 -04:00
uhid
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	statx: Add a system call to make enhanced file info available	2017-03-02 20:51:15 -05:00
Makefile	statx: Add a system call to make enhanced file info available	2017-03-02 20:51:15 -05:00