On 04/09/2013 07:44 AM, Arnd Bergmann wrote: > On Friday 05 April 2013, Stephen Warren wrote: >> This branch includes various cleanup of the core Tegra support. >> >> * Unification of the separate board-dt-tegra*.c files into a single >> tegra.c, now that everything is DT-driven and basically identical. >> * Use of_clk_get() in the Tegra clocksource driver so that clocks are >> described in DT rather than hard-coding clock names. >> * Some cleanup of the PMC-related code, with the aim that the PMC >> "driver" contains more of the code that touches PMC registers, rather >> than spreading PMC register accesses through other files. >> * Conversion of the "PMC" driver to acquire resources describe in device >> tree rather than hard-coding them. >> * Use of common code for the CPU sleep TLB invalidation. >> > > Pulled into next/cleanup branch and resolved the conflict against > an earlier cleanup that was already present there, fixup below. Oh yes, sorry I forgot to mention that; of course this conflict doesn't show up when I build my own for-next, but rather only in arm-soc/linux-next so I forgot about it:-( Anyway, the resolution you posted looks good. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
