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

[Nicolas Ferre]

Le 20/05/2015 02:27, Stephen Rothwell a écrit :
> Hi Kukjin,
> 
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/configs/multi_v7_defconfig between various commits from the
> arm-soc and at91 trees and various commits from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

AT91 part seems okay. Thanks,
-- 
Nicolas Ferre