David S. Miller 5cd3da4ba2 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Simple overlapping changes in stmmac driver. Adjust skb_gro_flush_final_remcsum function signature to make GRO list changes in net-next, as per Stephen Rothwell's example merge resolution. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-03 10:29:26 +09:00
..
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2018-06-19 07:44:51 +09:00
char	treewide: Use array_size() in vzalloc()	2018-06-12 16:19:22 -07:00
cio	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2018-06-19 07:44:51 +09:00
crypto	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
net	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00
scsi	SCSI misc on 20180610	2018-06-10 13:01:12 -07:00
virtio	virtio/s390: implement PM operations for virtio_ccw	2018-02-14 14:34:09 +02:00
Makefile	kbuild: rename built-in.o to built-in.a	2018-03-26 02:01:19 +09:00