[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20101019154654.GD4589@kroah.com>
Date: Tue, 19 Oct 2010 08:46:54 -0700
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Anatolij Gustschin <agust@...x.de>,
David Daney <ddaney@...iumnetworks.com>,
Ralf Baechle <ralf@...ux-mips.org>
Subject: Re: linux-next: manual merge of the usb tree with the mips tree
On Mon, Oct 18, 2010 at 05:06:19PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/Kconfig between commit
> cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
> for OCTEON II SOCs") from the mips tree and commit
> c67a807cb13570bfc7b78f53158d14a433c59591 ("USB: add USB EHCI support for
> MPC5121 SoC") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks for the fix, looks fine.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists