David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/s390/net/bpf_jit_comp.c drivers/net/ethernet/ti/netcp_ethss.c net/bridge/br_multicast.c net/ipv4/ip_fragment.c All four conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-31 23:52:20 -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-07-31 23:52:20 -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: fix typos in topology header	2015-07-02 12:40:10 +01:00
video
xen
Kbuild