David S. Miller e0ada51db9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-21 16:32:48 -04:00
..
acpi	xen: fixes for 4.17-rc1	2018-04-12 11:04:35 -07:00
asm-generic	asm-generic fixes for v4.17-rc1	2018-04-12 09:15:48 -07:00
clocksource
crypto
drm
dt-bindings	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-21 16:32:48 -04:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-21 16:32:48 -04:00
math-emu
media	media updates for v4.17-rc1	2018-04-10 10:10:30 -07:00
memory
misc
net	net/ipv6: Make from in rt6_info rcu protected	2018-04-21 16:06:14 -04:00
pcmcia
ras
rdma
scsi
soc
sound
target
trace	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-21 16:32:48 -04:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-21 16:32:48 -04:00
video
xen	xen/sndif: Sync up with the canonical definition in Xen	2018-04-17 08:26:33 -04:00