On Thu, Jul 26, 2012 at 10:58 PM, Linus Torvalds <torva...@linux-foundation.org> wrote: > On Wed, Jul 25, 2012 at 3:48 PM, Linus Walleij <linus.wall...@linaro.org> > wrote: >> >> in Grants absence, these are my queued and -next-tested changes >> for v3.6, please pull them in. Grants "merge" branch prior to his >> absence was merged in as a base for this patch series. > > Please verify my conflict resolution in drivers/gpio/gpio-mxc.c. > > The resolution seemed pretty straight-forward, but I obviously didn't > test the result, so it would be best to double-check,
LooksGoodToMe(TM). Better page the MXC people so they can scream if something goes wild. 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/
