Merge branch 'k.o/for-4.3-v1' into k.o/for-4.4
authorDoug Ledford <dledford@redhat.com>
Wed, 21 Oct 2015 20:40:21 +0000 (16:40 -0400)
committerDoug Ledford <dledford@redhat.com>
Wed, 21 Oct 2015 20:40:21 +0000 (16:40 -0400)
commitfc81a06965396150a395b1fe29f1bd13d4825ad6
treee08fd551a033e039db7361fa011baf1e51b5830f
parent070b399723206a4ed80410358f801a7df68d08e6
parent0ca81a2840f77855bbad1b9f172c545c4dc9e6a4
Merge branch 'k.o/for-4.3-v1' into k.o/for-4.4

Pick up the late fixes from the 4.3 cycle so we have them in our
next branch.