David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
block	s390/dasd: fix IO error for newly defined devices	2018-04-23 07:57:16 +02:00
char	s390/sclp: avoid potential usage of uninitialized value	2018-04-16 09:10:17 +02:00
cio	s390/qdio: don't release memory in qdio_setup_irq()	2018-05-15 07:40:38 +02:00
crypto	s390/zcrypt: Support up to 256 crypto adapters.	2018-04-11 10:36:27 +02:00
net	s390/qeth: improve fallback to random MAC address	2018-04-27 13:38:49 -04:00
scsi	scsi: zfcp: fix infinite iteration on ERP ready list	2018-05-08 00:01:01 -04: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