Re: [Qemu-devel] [PULL 00/25] Memory API conversion, batch 10

[Blue Swirl]

On Sun, Oct 9, 2011 at 12:07 PM, Avi Kivity <address@hidden> wrote:
> On 10/09/2011 01:01 PM, Blue Swirl wrote:
>>
>> On Sun, Oct 9, 2011 at 10:33 AM, Avi Kivity<address@hidden>  wrote:
>> >  On 10/02/2011 04:26 PM, Avi Kivity wrote:
>> >>
>> >>  Please pull from:
>> >>
>> >>     git://github.com/avikivity/qemu.git memory/batch
>> >>
>> >>  etrax, milkymist, serial conversions.  All have already been posted on
>> >> the
>> >>  list.
>> >>
>> >>
>> >
>> >  Ping?
>>
>> Sorry, the recent PPC and LM32 pulls are conflicting:
>>
>>
>
> I pushed a merge commit that resolves the conflict on top.  Same URL and
> branch:
>
>   git://github.com/avikivity/qemu.git memory/batch

Thanks, pulled.