David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05:00
..
block	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
char	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
cio	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
crypto	ktime: Cleanup ktime_set() usage	2016-12-25 17:21:22 +01:00
net	s390/qeth: fix retrieval of vipa and proxy-arp addresses	2017-01-12 10:02:43 -05:00
scsi	scsi: zfcp: fix rport unblock race with LUN recovery	2016-12-14 15:17:20 -05:00
virtio	virtio/s390: virtio: constify virtio_config_ops structures	2017-01-19 23:46:34 +02:00
Makefile	virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio	2015-07-07 14:27:06 +03:00