Re: [PATCH v2] xen/Makefile: resolve merge conflict with 9fa5780beea1

2012-10-02 Thread Konrad Rzeszutek Wilk
On Tue, Oct 02, 2012 at 05:45:17PM +0100, Stefano Stabellini wrote: > This patch is actually a merge conflict resolution between Konrad's Xen > tree and the following commit: > > commit 9fa5780beea1274d498a224822397100022da7d4 > Author: Jan Beulich > Date: Tue Sep 18 12:23:02 2012 +0100 > >

[PATCH v2] xen/Makefile: resolve merge conflict with 9fa5780beea1

2012-10-02 Thread Stefano Stabellini
This patch is actually a merge conflict resolution between Konrad's Xen tree and the following commit: commit 9fa5780beea1274d498a224822397100022da7d4 Author: Jan Beulich Date: Tue Sep 18 12:23:02 2012 +0100 USB EHCI/Xen: propagate controller reset information to hypervisor Compile dbgp.