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)
commit0699ee7ad7da8bde59d9cf13a50da95e1931e61d
tree2df54fc0d365b0645c4072360b610885351e16ef
parent9247a8eba62058dba6d018fca4e33332e4c535e8
parent4dc544427991e3cef38ce3ae124b7e6557063bd3
Merge branch 'for-4.2-misc' into k.o/for-4.2