From mboxrd@z Thu Jan  1 00:00:00 1970
From: nicolas.ferre@atmel.com (Nicolas Ferre)
Date: Wed, 20 May 2015 09:45:56 +0200
Subject: linux-next: manual merge of the samsung tree with the arm-soc
 and at91 trees
In-Reply-To: <20150520102743.3d336a73@canb.auug.org.au>
References: <20150520102743.3d336a73@canb.auug.org.au>
Message-ID: <555C3BB4.2000802@atmel.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

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