On Tue, 15 Jul 2008, Ingo Molnar wrote:
quoted text
> 
> hm, you just pushed another fix for that out via:
> [...]
> that would collide. Here's a (separate) merged up tree that will pull 
> cleanly:

Heh, I just merged it myself - it happens all the time, I did't even think 
about it.

If it had been any more complex I would have emailed you (and hopefully 
noticed this follow-up email before doing that), but it was rather obvious 
enough, and I just picked your side.

		Linus
--
unsubscribe notice
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/