kernel_optimize_test/drivers/s390
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
char
cio
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
virtio virtio/s390: virtio: constify virtio_config_ops structures 2017-01-19 23:46:34 +02:00
Makefile