Anthony Liguori 02653c5ea7 pvpanic: fix bad merge
Context matching caused the 'has_pvpanic = true' to be applied to
the 1.6 machine type instead of the 1.5 machine type.

Reported-by: Markus Armbruster <armbru@redhat.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-08-13 09:02:52 -05:00
..
2013-07-23 00:37:33 +02:00
2013-07-29 21:05:58 +02:00
2013-08-07 12:46:40 -05:00
2013-07-29 21:06:05 +02:00
2013-07-29 21:06:46 +02:00
2013-07-29 21:06:57 +02:00
2013-07-29 21:07:02 +02:00
2013-08-13 09:02:52 -05:00
2013-07-29 21:07:02 +02:00
2013-07-31 23:25:41 +02:00
2013-07-29 21:06:28 +02:00
2013-08-12 11:20:57 -05:00
2013-07-29 19:56:46 -05:00
2013-07-29 19:56:46 -05:00
2013-07-29 21:07:00 +02:00
2013-07-25 08:12:27 -05:00
2013-07-29 21:07:01 +02:00
2013-07-29 21:07:02 +02:00
2013-08-08 13:29:25 +02:00
2013-08-12 08:32:55 -05:00