linux-next: manual merge of the arm-soc tree with the mfd tree

Thu, 27 Jun 2013 23:02:23 -0700 

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-exynos/mach-universal_c210.c between commit 555183096fc7
("regulator: max8998: Use arrays for specifying voltages in platform
data") from the mfd tree and commit ca9143501c30 ("ARM: EXYNOS: Remove
unused board files") from the arm-soc tree.

I just removed the file and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgp0Ee0X73Bzw.pgp
Description: PGP signature

Reply via email to