David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three trivial overlapping conflicts. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-02 22:14:21 -04:00
..
asm-generic	net: socket: implement 64-bit timestamps	2019-04-19 14:07:40 -07:00
drm
linux	taprio: Add support for cycle-time-extension	2019-05-01 11:58:51 -04:00
misc	habanalabs: add comments in uapi/misc/habanalabs.h	2019-02-28 13:06:09 +01:00
mtd
rdma	IB/mlx5: Fix scatter to CQE in DCT QP creation	2019-04-18 03:13:41 -03:00
scsi
sound	ALSA: uapi: #include <time.h> in asound.h	2019-04-02 09:27:21 +02:00
video
xen