Merge branch 'i40iw' into k.o/for-4.8
authorDoug Ledford <dledford@redhat.com>
Thu, 4 Aug 2016 01:00:16 +0000 (21:00 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 4 Aug 2016 01:00:16 +0000 (21:00 -0400)

Trivial merge