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

[Nicolas Ferre]

Le 31/07/2015 00:38, Stephen Rothwell a écrit :
> Hi Nicolas,
> 
> Today's linux-next merge of the at91 tree got a conflict in:
> 
>   arch/arm/mach-at91/sama5.c
> 
> between commit:
> 
>   19c233b79d1a ("ARM: appropriate __init annotation for const data")
> 
> from the arm-soc tree and commit:
> 
>   a6e41317b9b8 ("ARM: at91/soc: add basic support for new sama5d2 SoC")
> 
> from the at91 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

The merge is correct. Thanks Stephen!

Bye,
-- 
Nicolas Ferre