From: Kukjin Kim <kgene.kim@samsung.com>
To: "'Stephen Rothwell'" <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        "'Amit Daniel Kachhap'" <amit.daniel@samsung.com>,
        "'Tomasz Figa'" <t.figa@samsung.com>,
        "'Linus Walleij'" <linus.walleij@linaro.org>
References: <20121030144412.4a4a60dc0dace86f1a91af8c@canb.auug.org.au>
In-reply-to: <20121030144412.4a4a60dc0dace86f1a91af8c@canb.auug.org.au>
Subject: RE: linux-next: manual merge of the samsung tree with the pinctrl tree
Date: Wed, 07 Nov 2012 11:26:36 +0900
Message-id: <0c4401cdbc8f$4ff0f8b0$efd2ea10$%kim@samsung.com>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7bit
Thread-index: Ac22UN3k4n7dn9LQT1yFcdaN5NT39AGM+5jQ
Content-language: ko
DLP-Filter: Pass
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 871
Lines: 28

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi,

> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/boot/dts/exynos4210.dtsi between commit a7a8241540c3 ("ARM: dts:
> exynos4210-pinctrl: Add nodes for pin banks") from the pinctrl tree and
> commit 8d4155dbb184 ("ARM: EXYNOS: Add devicetree node for TMU driver for
> exynos4") from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
Correct, thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/