David S. Miller 29fda25a2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-01 10:07:50 -07:00
..
asm-generic	tty: Fix TIOCGPTPEER ioctl definition	2017-07-17 17:04:41 +02:00
drm	drm/amdgpu: Fix the exported always on CU bitmap	2017-06-29 12:43:49 -04:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-01 10:07:50 -07:00
misc	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
mtd	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
rdma	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
scsi	scsi: cxlflash: Support AFU debug	2017-06-26 15:01:12 -04:00
sound	ASoC: Updates for v4.13	2017-07-03 19:51:42 +02:00
video	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
xen	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00