Re: linux-next: manual merge of the l2-mtd tree with Linus' tree

[Stephen Rothwell]

On Tue, 29 May 2012 12:33:01 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> drivers/mtd/nand/mxc_nand.c between commit 97c3213fd9fc ("mtd mxc_nand:
> prepare/unprepare clock") from Linus' tree and commit 625bdd2a6bd0
> ("nand: mxc_nand: Use clk_prepare_enable/clk_disable_unprepare") from the
> l2-mtd tree.
> 
> The former is a superset of the latter.

Actually they modify different functions, so I fixed it up.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature