From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kukjin Kim <kgene.kim@samsung.com>
Subject: RE: linux-next: manual merge of the mmc tree with the s5p tree
Date: Wed, 22 Feb 2012 11:19:28 +0900
Message-ID: <012701ccf108$67a1ef80$36e5ce80$%kim@samsung.com>
References: <20120222124915.9414928ca50d8b181820c733@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mailout4.samsung.com ([203.254.224.34]:17955 "EHLO
	mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755206Ab2BVCTb (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Tue, 21 Feb 2012 21:19:31 -0500
In-reply-to: <20120222124915.9414928ca50d8b181820c733@canb.auug.org.au>
Content-language: ko
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: 'Stephen Rothwell' <sfr@canb.auug.org.au>, 'Chris Ball' <cjb@laptop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, 'Jaehoon Chung' <jh80.chung@samsung.com>, 'Kyungmin Park' <kyungmin.park@samsung.com>, 'Thomas Abraham' <thomas.abraham@linaro.org>

Stephen Rothwell wrote:
> 
> Hi Chris,
> 
Hi Stephen,

> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/sdhci-s3c.c between commit bd0955ed6b1b ("mmc:
> sdhci-s3c: add platform data for the second capability") from the s5p
> tree and commit 7880741a0625 ("mmc: sdhci-s3c: derive transfer width host
> capability from max_width in platform data") from the mmc tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Look ok to me, and let me carry following when it is required.

Thanks.

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