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

[Greg KH]

On Fri, May 11, 2012 at 03:12:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/quatech_usb2/quatech_usb2.c between commit 38902cf9f6be
> ("USB: remove staging quatech_usb2 driver") from the usb tree and a
> couple of commits from the staging tree.
> 
> The former removes the file, so I did that.

Wonderful, thanks for doing that.

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/