David S. Miller 182ad468e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cavium/Kconfig The cavium conflict was overlapping dependency changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-13 16:23:11 -07:00
..
asm-generic	errno.h: Improve ENOSYS's comment	2015-04-17 09:03:58 -04:00
drm	drm/amdgpu: Drop drm/ prefix for including drm.h in amdgpu_drm.h	2015-07-29 15:48:05 -04:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-08-13 16:23:11 -07:00
misc	cxl: Implement an ioctl to fetch afu card-id, offset-id and mode	2015-06-03 13:27:15 +10:00
mtd
rdma	IB/core: Add timestamp_mask and hca_core_clock to query_device	2015-06-12 14:49:10 -04:00
scsi
sound	ASoC: topology: Add private data type and bump ABI version to 3	2015-08-06 12:34:46 +01:00
video
xen
Kbuild