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)
commit7c41765d8c30bdf1b056533c0521ecdec0ec11fa
treee1365f63a97e80c21938631598cf9726e6704d9e
parent0636e9ab8355c82ff7e9d6bb8aa2ded834b1f88d
parente6d66e3eb65f8b083d827f6864e70b8dcea9d9bb
Merge branches 'hfi1' and 'sge-limit' into k.o/for-4.8-2