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)

Trivial merge