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
..
asm-generic	Merge branch 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2018-04-12 17:07:04 -07:00
drm	Linux 4.16-rc7	2018-03-28 14:30:41 +10:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-04-21 15:56:15 -04:00
misc	ocxl: Add get_metadata IOCTL to share OCXL information to userspace	2018-03-02 13:02:14 +11:00
mtd	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
rdma	IB/mlx5: Device memory support in mlx5_ib	2018-04-05 13:04:49 -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: soc-generic-dmaengine-pcm: Fix sparse warnings	2018-02-26 11:05:12 +00:00
video	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
xen	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00