Dave Airlie 3fce461827 BackMerge v4.18-rc7 into drm-next ... rmk requested this for armada and I think we've had a few conflicts build up. Signed-off-by: Dave Airlie <airlied@redhat.com>		2018-07-30 10:39:22 +10:00
..
asm-generic	Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-06-04 21:02:18 -07:00
drm	Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next	2018-07-20 14:54:31 +10:00
linux	BackMerge v4.18-rc7 into drm-next	2018-07-30 10:39:22 +10:00
misc	ocxl: Add an IOCTL so userspace knows what OCXL features are available	2018-06-03 20:40:32 +10:00
mtd	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
rdma	Verbs flow counters support	2018-06-04 08:48:11 -06:00
scsi	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
sound	ASoC: Updates for v4.18	2018-06-05 16:51:55 +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/privcmd: add IOCTL_PRIVCMD_MMAP_RESOURCE	2018-05-14 15:25:37 +02:00