David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
block	libnvdimm for 4.12	2017-05-05 18:49:20 -07:00
char	s390/sclp: Detect KSS facility	2017-04-21 11:08:04 +02:00
cio	Make some symbols in vfio-ccw static, as detected by sparse.	2017-05-23 07:33:57 +02:00
crypto	s390/zcrypt: Fix blocking queue device after unbind/bind.	2017-06-02 14:30:12 +02:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
scsi	SCSI misc on 20170220	2017-02-21 11:51:42 -08:00
virtio	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-05-16 09:24:44 -07:00
Makefile	virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio	2015-07-07 14:27:06 +03:00