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

[Greg KH]

On Mon, Apr 23, 2012 at 03:11:46PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3
> ("USB: dt9812.c: remove err() usage") from the usb tree and commit
> 73e2918990c0 ("staging: Fix typo in multiple files") from the staging
> tree.
> 
> The former supercedes the latter, so I used that.

Thanks, that sounds correct.

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/