David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-18 01:17:32 -04:00
..
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
configfs
connector
hidraw
hw_breakpoint
kdb
kfifo
kobject
kprobes	samples/kretprobe: fix the wrong type	2016-08-04 08:50:07 -04:00
livepatch
pktgen	samples: Add an IPv6 '-6' option to the pktgen scripts	2016-07-20 22:16:02 -07:00
rpmsg
seccomp	samples/seccomp: Add standalone config option	2016-07-07 10:58:03 -07:00
trace_events
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
Kconfig	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-07-29 17:38:46 -07:00
Makefile	tracing: Add trace_printk sample code	2016-06-20 09:54:21 -04:00