Merge branches 'mlx5-1' and 'srp-1' into k.o/for-4.7
authorDoug Ledford <dledford@redhat.com>
Thu, 12 May 2016 18:21:02 +0000 (14:21 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 12 May 2016 18:21:02 +0000 (14:21 -0400)
commit321aebb880d2bfdf9cff503f57207e930aee6b1d
tree9819bff1d46f436c8d4c4b4f9609e8af4295014f
parent80835cba4b857485b068e1ce83512e896e6f001e
parent3849e44d1c4b11c9e0f0f0343a0360b5e9594fb6
Merge branches 'mlx5-1' and 'srp-1' into k.o/for-4.7