Re: linux-next: semaphore update merge conflicts

From: Stephen Rothwell
Date: Fri Feb 29 2008 - 07:17:30 EST


On Fri, 29 Feb 2008 11:17:31 +0100 Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> wrote:
>
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.

OK, thanks.

By the way, is there some place I can get a cross compiler to build avr32
kernels (or better yet a recipe for crosstool to make one)?

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature