* Zumeng Chen <zumeng.chen@xxxxxxxxxxxxx> [120710 17:57]: > 于 2012年07月10日 23:34, Arnd Bergmann 写道: > >I got a conflict in arch/arm/mach-omap2/common-board-devices.c between > >16aced80f6739 "ARM: OMAP3530evm: set pendown_state and debounce time for > >ads7846" and 97ee9f01d6f26 "ARM: OMAP: fix the ads7846 init code", > >see my resolution below. > > > >Please check if what I have in the for-next branch makese sense to you > >all. > > No problem, many thanks Arnd for your information. > I'll check it, test it, and send you feedback. Thanks, looks good. Also I've checked that for-next builds fine with my testconfigs. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
