Re: linux-next: manual merge of the watchdog tree with the mfd tree
From: Wim Van Sebroeck
Date: Fri Feb 08 2013 - 06:36:35 EST
> Today's linux-next merge of the watchdog tree got conflicts in
> drivers/watchdog/Kconfig and drivers/watchdog/Makefile between commit
> 699ff59052e7 ("watchdog: Add support for ux500_wdt watchdog") from the
> mfd tree and commit 77b709cb6c9d ("watchdog: introduce retu_wdt driver")
> from the watchdog tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/