David S. Miller 7cda4cee13 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Small overlapping change conflict ('net' changed a line, 'net-next' added a line right afterwards) in flexcan.c Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-05 10:44:19 -05:00
..
auxdisplay
blackfin
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-05 10:44:19 -05:00
configfs
connector	A relatively calm cycle for the docs tree again.	2017-11-13 08:25:06 -08:00
hidraw	kbuild: remove all dummy assignments to obj-	2017-11-18 11:46:06 +09:00
hw_breakpoint
kdb
kfifo
kobject
kprobes	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-13 13:05:08 -08:00
livepatch
mei
mic/mpssd	Merge branch 'linus' into locking/core, to resolve conflicts	2017-11-07 10:32:44 +01:00
pktgen
rpmsg
seccomp	kbuild: remove all dummy assignments to obj-	2017-11-18 11:46:06 +09:00
sockmap	kbuild: remove all dummy assignments to obj-	2017-11-18 11:46:06 +09:00
statx	kbuild: remove all dummy assignments to obj-	2017-11-18 11:46:06 +09:00
timers
trace_events	Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2017-11-15 10:14:11 -08:00
trace_printk
uhid	kbuild: remove all dummy assignments to obj-	2017-11-18 11:46:06 +09:00
v4l
vfio-mdev
watchdog
Kconfig
Makefile