Date: Fri, 11 Mar 2011 16:19:09 +0900
From: Kukjin Kim <kgene.kim@samsung.com>
Subject: RE: linux-next: manual merge of the usb tree with the s5p tree
In-reply-to: <4D79C3AC.7090900@metafoo.de>
To: "'Lars-Peter Clausen'" <lars@metafoo.de>,
        "'Stephen Rothwell'" <sfr@canb.auug.org.au>
Cc: "'Greg KH'" <greg@kroah.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org
Message-id: <010b01cbdfbc$a3052460$e90f6d20$%kim@samsung.com>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-language: ko
Content-transfer-encoding: 7BIT
Thread-index: AcvftvPyRy8F0K6SQkKHP7iup5TZOwABWDug
References: <20110311170912.0fb48cf4.sfr@canb.auug.org.au>
 <4D79C3AC.7090900@metafoo.de>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1184
Lines: 39

Lars-Peter Clausen wrote:
> 
> On 03/11/2011 07:09 AM, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > arch/arm/mach-s3c2440/mach-gta02.c between commit 326d05c15f7f ("ARM:
> > S3C2440: Request usb pullup pin before using it on GTA02") from the s5p
> > tree and commit e27c3c5c7e0f ("ARM: s3c24xx: Switch to common GPIO
> > controlled UDC pullup implementation") from the usb tree.
> >
> > The latter commit removes the function gta02_udc_command() which is
> > modified by the former.  I removed the function.
> >
> 
> Hi
> 
> Kukjin could you drop 326d05c15f7f ("ARM: S3C2440: Request usb pullup pin
> before using it on GTA02") from your tree? It has been superseded by the
> other
> commit in Gregs tree.
> 
Hi,

Ok, I did it.

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/