linux-next: manual merge of the arm-current tree with Linus' tree

[Stephen Rothwell]

Hi Russell,

Today's linux-next merge of the arm-current tree got a conflict in
arch/arm/mach-exynos/common.c between (I think) commit 237c78beb8a9
("Merge branch 'depends/rmk/for-linus' into samsung/dt") from Linus' tree
and commit 588ac27d3419 ("ARM: 7273/1: EXYNOS: Fix build error which was
from common.c and old cpu.c") from the arm-current tree.

So this arm-current fi is superceded by the merge above that is now in
Linus' tree.

I fixed it up by ignoring the arm-current version.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature