On Fri, 20 Dec 2013 14:00:21 +1000 Peter Crosthwaite <peter.crosthwa...@xilinx.com> wrote:
> On Fri, Dec 20, 2013 at 10:49 AM, Anthony Liguori <anth...@codemonkey.ws> > wrote: > > On Wed, Dec 18, 2013 at 8:59 AM, Luiz Capitulino <lcapitul...@redhat.com> > > wrote: > >> The following changes since commit > >> e157b8fdd412d48eacfbb8c67d3d58780154faa3: > >> > >> Merge remote-tracking branch 'bonzini/virtio' into staging (2013-12-13 > >> 11:10:33 -0800) > >> > >> are available in the git repository at: > > > > Sorry, you lost the merge conflict to Peter. Can you please rebase > > and resubmit? Sure, no problem. > Sorry - this one is my fault. Peter, can you resend your series then?
