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

From: Stephen Rothwell
Date: Sun Nov 23 2014 - 19:16:48 EST

Hi Maxime,

Today's linux-next merge of the sunxi tree got a conflict in
arch/arm/boot/dts/sun6i-a31.dtsi between commit 123ccfcc632a ("Revert
merge of sunxi/dt") from the arm-soc tree and commits from the sunxi

I fixed it up (I just used the version from the sunxi tree) and can
carry the fix as necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp7AnXlVYj5u.pgp
Description: OpenPGP digital signature