Subject: linux-next: manual merge of the trivial tree with the tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 14 Jun 2011 14:31:08 +1000

Hi Jiri,

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.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/