On Wed, Jan 8, 2014 at 5:14 AM, Stephen Rothwell <s...@canb.auug.org.au> wrote:
> Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in > arch/xtensa/Kconfig between commit dbacef090841 ("xtensa: add SMP > support") from the xtensa tree and commit a1a2bdec4772 ("gpio: xtensa: > depend on HAVE_XTENSA_GPIO32") from the gpio tree. Looks correct, thanks! Yours, Linus Walleij -- 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/