[libvirt] [PATCH] vmx: Fix a VMX parsing problem.

[Geoff Hickey]

Thanks Eric!

> The conflicts marker is generally only useful for downstream builds that
> cherry-pick patches.  For upstream, we don't need it.

Good to know. I had cherry-picked this out of the maintenance branch I'm
actually using onto master, but in future I'll remove those from the commit
messages.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150107/ab9c587b/attachment-0001.htm>