David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/infiniband/hw/cxgb4/device.c The cxgb4 conflict was simply overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-07-22 00:44:59 -07:00
..
block	s390: avoid format strings leaking into names	2014-06-11 10:13:27 +02:00
char	s390/3270: correct size detection with the read-partition command	2014-07-16 10:48:10 +02:00
cio	s390/ccwgroup: use ccwgroup_ungroup wrapper	2014-06-16 10:32:52 +02:00
crypto	s390/zcrypt: improve device probing for zcrypt adapter cards	2014-07-16 10:48:12 +02:00
kvm	virtio_ccw: introduce device_lost in virtio_ccw_device	2014-04-28 11:34:13 +09:30
net	qeth: Display adjacent switch attributes	2014-07-21 20:21:40 -07:00
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
Makefile