qulogic/libgnt

qulogic/libgnt/
resolving merge conflicts

2017-11-16, Gary Kramlich
eadcb3e88e40