Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:
> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflict in
> arch/arm/mach-bcmring/core.c between commit
> dd84ce18c8f522d26aef6e9e9c05c32485b667a7 ("ARM: Consolidate
> clks_register() and similar") from the arm tree and commit
> 25c692215f5dfc4992b11c4fb57538d1139d6636 ("Consolidate clks_register()
> and similar") from the davinci tree.
>
> The davinci tree version has a typo (ARRAY_SIEZ v. ARRAY_SIZE) so I used
> the arm tree version.
OK, I'll drop the one from the davinci tree.
Thanks,
Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
