From mboxrd@z Thu Jan  1 00:00:00 1970
From: tony@atomide.com
Subject: Re: board-netstar.c in linus tree
Date: Tue, 28 Mar 2006 05:18:36 -0800
Message-ID: <20060328131835.GC28751@atomide.com>
References: <20060328074914.57511.qmail@web32911.mail.mud.yahoo.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-omap-open-source-bounces@linux.omap.com>
Content-Disposition: inline
In-Reply-To: <20060328074914.57511.qmail@web32911.mail.mud.yahoo.com>
List-Unsubscribe: <http://linux.omap.com/mailman/listinfo/linux-omap-open-source>,
	<mailto:linux-omap-open-source-request@linux.omap.com?subject=unsubscribe>
List-Archive: <http://linux.omap.com/pipermail/linux-omap-open-source>
List-Post: <mailto:linux-omap-open-source@linux.omap.com>
List-Help: <mailto:linux-omap-open-source-request@linux.omap.com?subject=help>
List-Subscribe: <http://linux.omap.com/mailman/listinfo/linux-omap-open-source>,
	<mailto:linux-omap-open-source-request@linux.omap.com?subject=subscribe>
Sender: linux-omap-open-source-bounces@linux.omap.com
Errors-To: linux-omap-open-source-bounces@linux.omap.com
To: Komal Shah <komal_shah802003@yahoo.com>
Cc: linux-omap-open-source@linux.omap.com
List-Id: linux-omap@vger.kernel.org

* Komal Shah <komal_shah802003@yahoo.com> [060327 23:50]:
> Tony,
> 
> Need to remove board-netstar.c from linus mainline tree. Just got the
> merge conflict on delete/modify :)

Thanks, I'll add that to the list. I'll be working on upstream merge
patches today.

Tony