Re: [Qemu-devel] [PATCH v2] Fix -device help and documentation

2010-05-22 Thread Blue Swirl
Thanks, applied. On Tue, May 11, 2010 at 12:02 PM, Markus Armbruster wrote: > Commit 6616b2ad reverted commit 40ea285c.  Looks like a mismerge to > me. > > Signed-off-by: Markus Armbruster > --- > v2: rebased (v1 fell through the cracks apparently) > >  qemu-options.hx |   15 ++- >  

[Qemu-devel] [PATCH v2] Fix -device help and documentation

2010-05-11 Thread Markus Armbruster
Commit 6616b2ad reverted commit 40ea285c. Looks like a mismerge to me. Signed-off-by: Markus Armbruster --- v2: rebased (v1 fell through the cracks apparently) qemu-options.hx | 15 ++- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/qemu-options.hx b/qemu-options.