Merge branches 'hns' and 'misc' into k.o/for-next
authorDoug Ledford <dledford@redhat.com>
Wed, 27 Sep 2017 14:58:06 +0000 (10:58 -0400)
committerDoug Ledford <dledford@redhat.com>
Wed, 27 Sep 2017 14:58:06 +0000 (10:58 -0400)
Signed-off-by: Doug Ledford <dledford@redhat.com>

Trivial merge