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
rpmsg
seccomp
trace_events
trace_printk
uhid
v4l
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