Re: linux-next: semaphore update merge conflicts

[Haavard Skinnemoen]

On Fri, 29 Feb 2008 15:39:58 +1100
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.

Haavard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/