Merge branch 'hns-roce' into k.o/for-4.9
authorDoug Ledford <dledford@redhat.com>
Thu, 25 Aug 2016 14:05:23 +0000 (10:05 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 25 Aug 2016 14:05:23 +0000 (10:05 -0400)

Trivial merge