On Tue, Aug 12, 2008 at 04:58:30PM +1000, Stephen Rothwell wrote:
> Hi Alan,
>
> Today's linux-next merge of the ttydev tree got a conflict in
> drivers/usb/class/cdc-acm.c between commit
> 9e02103a5b182c5c99aaa8efa1def46bd215c707 ("usb: cdc-acm: stop dropping tx
> buffers") from the usb.current tree and commit
> 1b873c25c7cb1571784626ce044b63a28909e288 ("tty-fix-cdc-acm") from the
> ttydev tree.
>
> The former removed a line that the latter modified. I just removed the
> line.
Sounds correct to me, thanks for doing that.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
