* Arnd Bergmann <[email protected]> [120229 12:48]: > On Wednesday 29 February 2012, Tony Lindgren wrote: > > This is mostly changes needed for io.h removal, and one > > patch to remove unused flag for McSPI. Note that these > > are based on RMK's for-armsoc. > > > > Also, these cause a minor merge conflict for mach-omap2/Kconfig > > with the fixes-non-critical posted in this series of pull > > requests. > > Hmm, I did not see the conflict in this one, but I saw one in the > dt branch that I fixed.
OK sounds like I did not remember correctly where the conflict was. > I pulled this one into next/cleanup. Thanks. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
