On Tue, 14 Jun 2011, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> sound/soc/fsl/fsl_ssi.c between commit 147dfe90f730 ("ASoC: p1022ds: fix
> incorrect referencing of device tree properties") from the sound tree and
> commit 28f65c11f2ff ("treewide: Convert uses of struct resource to
> resource_size(ptr)") from the trivial tree.
>
> The former supercedes the latter.
I have dropped the hunk from my tree, thanks for reporting.
--
Jiri Kosina
SUSE Labs
--
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
