Subject: linux-next: manual merge of the arm-soc tree with the arm-soc and pincrtl trees

From: [email-masked] (Nicolas Ferre)
Date: Mon, 26 Nov 2012 11:14:25 +0100

On 11/26/2012 10:56 AM, Stephen Rothwell :
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in 
> arch/arm/boot/dts/at91sam9g45.dtsi between various commits from
> the arm-soc and pincrtl trees and commit 7492e7ca0f95 ("ARM:
> at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45")
> from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

Good fix. Thanks for your help Stephen.

Best regards,
- -- 
Nicolas Ferre