On Thu, Sep 27, 2012 at 03:31:19PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/char/pcmcia/synclink_cs.c between commit f21ec3d2d46e ("serial:
> add a new helper function") from the tty tree and commit 221b7b5796b5
> ("pcmcia: synclink_cs: fix potential tty NULL dereference") from the
> char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, 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
