Merge branch 'for-4.2-misc' into k.o/for-4.2
authorDoug Ledford <dledford@redhat.com>
Thu, 11 Jun 2015 05:13:30 +0000 (01:13 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 11 Jun 2015 05:13:30 +0000 (01:13 -0400)

Trivial merge