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

From: Stephen Rothwell
Date: Mon Jun 17 2013 - 03:01:28 EST

Hi David,

Today's linux-next merge of the msm tree got a conflict in
arch/arm/boot/dts/msm8960-cdp.dts between commit e45600107b67 ("Merge tag
'msm-cleanup-for-3.11' of
git:// into
next/cleanup") from the arm-soc tree and commit 70f0aa52e090 ("Merge
branch 'msm-fix' into for-next") from the msm tree.

I fixed it up (the arm-soc merge used serial@19440000, the msm merge used
serial@19c40000, I used the arm-soc version) and can carry the fix as
necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature