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

…

char

s390/3270: correct size detection with the read-partition command

2014-07-16 10:48:10 +02:00

cio

…

crypto

s390/zcrypt: improve device probing for zcrypt adapter cards

2014-07-16 10:48:12 +02:00

kvm

…

net

qeth: Display adjacent switch attributes

2014-07-21 20:21:40 -07:00

scsi

…

Makefile

…