Merge branch 'vnic' into k.o/for-next
authorDoug Ledford <[email protected]>
Fri, 29 Sep 2017 15:13:50 +0000 (11:13 -0400)
committerDoug Ledford <[email protected]>
Fri, 29 Sep 2017 15:13:50 +0000 (11:13 -0400)
Signed-off-by: Doug Ledford <[email protected]>

Trivial merge