On Fri, Feb 04, 2011 at 03:14:08PM +1100, Stephen Rothwell wrote:

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/Kconfig between commit
47d37d6f94ccf32d302492f969209930b2411f9e ("serial: Add auart driver for
i.MX23/28") from the i.M tree and commit
4564e1ef219fa69ed827fe2613569543a6b26fbc ("serial: pch_uart: support new
device ML7213") from the tty tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.

Looks good to me, thanks for handling this.

greg k-h