David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
asm-generic	net: Add a new socket option for a future transmit time.	2018-07-04 22:30:27 +09:00
drm	drm/tegra: Changes for v4.18-rc1	2018-05-22 10:45:43 +10:00
linux	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07: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