On Thu, Feb 10, 2011 at 04:29:14PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/68328serial.c between commit
> abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu: fix derefernce of
> port.tty") from the m68knommu tree and commit
> f094298bae5f5d0e1cb3bff4621aae7ef486812a ("68328serial: remove unsed
> m68k_serial->tqueue_hangup") from the tty tree.
>
> I just used the latter since it removed some of the code modified by the
> former.
Sounds fine, thanks.
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
