Merge branches 'hfi1' and 'sge-limit' into k.o/for-4.8-2
authorDoug Ledford <dledford@redhat.com>
Thu, 4 Aug 2016 01:51:20 +0000 (21:51 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 4 Aug 2016 01:51:20 +0000 (21:51 -0400)

Trivial merge