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

Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next

2019-02-22 15:56:42 +10:00

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

ubi: Expose the bitrot interface

2019-02-24 11:40:45 +01:00

rdma

IB/mlx5: Fix scatter to CQE in DCT QP creation

2019-04-18 03:13:41 -03:00

scsi

scsi: ufs: fix integer type usage in uapi header

2018-10-15 22:44:30 -04:00

sound

ALSA: uapi: #include <time.h> in asound.h

2019-04-02 09:27:21 +02:00

video

License cleanup: add SPDX license identifier to uapi header files with a license

2017-11-02 11:20:11 +01:00

xen

xen/gntdev: Add initial support for dma-buf UAPI

2018-07-26 23:05:14 -04:00