Date: Fri, 29 Feb 2008 11:17:31 +0100
From: Haavard Skinnemoen <hskinnemoen@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Matthew Wilcox <matthew@wil.cx>, linux-next@vger.kernel.org,
       LKML <linux-kernel@vger.kernel.org>, Greg KH <greg@kroah.com>,
       Mark Fasheh <mark.fasheh@oracle.com>
Subject: Re: linux-next: semaphore update merge conflicts
Message-ID: <20080229111731.13840877@hskinnemoen.norway.atmel.com>
In-Reply-To: <20080229153958.fc34e281.sfr@canb.auug.org.au>
References: <20080229153958.fc34e281.sfr@canb.auug.org.au>
Organization: Atmel Norway
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 573
Lines: 16

On Fri, 29 Feb 2008 15:39:58 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> 	arch/avr32/kernel/semaphore.c
> 		the avr32 tree appeared to just change spaces to tabs
> 		in this file so I removed it (as your changes did).

I yanked that change out of my tree. No point cleaning up that file if
it's going away.

Haavard
--
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/