On Tue, Oct 01, 2013 at 01:07:23PM +0200, Thierry Reding wrote: > Today's linux-next merge of the sh tree got conflicts in > > arch/sh/kernel/cpu/sh2a/Makefile > drivers/tty/serial/sh-sci.c > include/linux/serial_sci.h > > I fixed them up (see below). Please check if the resolution looks correct.
Looks correct to me, thanks for doing this. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
