Re: linux-next: manual merge of the usb tree with the usb.currenttree

[Greg KH]

On Tue, Nov 13, 2012 at 02:37:32PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/musb/ux500.c between commit 9a65d162e449 ("usb: musb: ux500:
> fix 'musbid' undeclared error in ux500_remove()") from the usb.current
> tree and commit 2f7711642559 ("usb: musb: remove hand-crafted id
> handling") from the usb tree.
> 
> The latter supercedes the former so I used that and can carry the fix as
> necessary (no action is required).

That is fine, thanks for doing this.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/