tree e08fd551a033e039db7361fa011baf1e51b5830f
parent 070b399723206a4ed80410358f801a7df68d08e6
parent 0ca81a2840f77855bbad1b9f172c545c4dc9e6a4
author Doug Ledford <dledford@redhat.com> 1445460021 -0400
committer Doug Ledford <dledford@redhat.com> 1445460021 -0400

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.