Merge branches 'hfi1' and 'mlx' into k.o/for-4.9-rc
authorDoug Ledford <dledford@redhat.com>
Thu, 17 Nov 2016 01:05:10 +0000 (20:05 -0500)
committerDoug Ledford <dledford@redhat.com>
Thu, 17 Nov 2016 01:05:10 +0000 (20:05 -0500)

Trivial merge